Trimming trailing spaces, removing tabs by a script
- using tab width of 4 spaces
- trailing space in property files is converted to unicode, so it is
visible in sources
- bat files use CRLF
- all other text files use just LF
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/build.xml b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/build.xml
index d944234..e150ef9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/build.xml
@@ -47,11 +47,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant ctxcheck (Executes the ejb-allowedmethods ctxcheck test)
- ant remove (Executes the ejb-allowedmethods remove test)
- ant all (Executes all the ejb allowedmethods tests)
- </echo>
+ <echo>
+ Usage:
+ ant ctxcheck (Executes the ejb-allowedmethods ctxcheck test)
+ ant remove (Executes the ejb-allowedmethods remove test)
+ ant all (Executes all the ejb allowedmethods tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.properties b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.properties
index 2fe2f64..c7457b5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-allowedmethods-ctxcheck"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.xml b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.xml
index 4956501..c6662b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,13 +46,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/Driver*.class,**/HereLocal*.class, **/LocalEntity.class, LocalEntityHome.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -63,14 +63,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java
index 8928c70..d3a6bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,11 +37,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-allowedmethods-ctxcheck");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
localSlsbGetEJBObject();
localSlsbGetEJBLocalObject();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java
index 252abd5..929cfca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -60,7 +60,7 @@
throw ise;
}
}
-
+
public void localSlsbGetEJBLocalObject() {
try {
Context ic = new InitialContext();
@@ -135,7 +135,7 @@
throw ise;
}
}
-
+
public void localEntityGetEJBLocalObject() {
try {
Context ic = new InitialContext();
@@ -195,5 +195,5 @@
public void ejbActivate() {}
public void ejbPassivate() {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java
index 4696c14..58a6ba7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,11 +33,11 @@
public HereLocalBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In HereLocalBean::ejbCreate !!");
+ System.out.println("In HereLocalBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void doSomethingHere() {
@@ -49,7 +49,7 @@
}
public void accessEJBLocalObject() {
- sc.getEJBLocalObject();
+ sc.getEJBLocalObject();
}
public void accessEJBHome() {
@@ -57,7 +57,7 @@
}
public void accessEJBLocalHome() {
- sc.getEJBLocalHome();
+ sc.getEJBLocalHome();
}
public void ejbRemove()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java
index f0526f0..731825a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java
@@ -24,7 +24,7 @@
public interface LocalEntity
extends EJBLocalObject
{
-
+
/**
* Returns the Name of a student.
* exception RemoteException
@@ -39,7 +39,7 @@
public void setName(String name);
public void localEntityGetEJBObject();
-
+
public void localEntityGetEJBLocalObject();
public void localEntityGetEJBHome();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java
index b01c9a6..8edabfc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java
@@ -99,7 +99,7 @@
courseIds = new ArrayList();
try {
InitialContext ic = new InitialContext();
- dataSource =
+ dataSource =
(DataSource) ic.lookup("java:comp/env/jdbc/devtestDS");
Context initial = new InitialContext();
} catch (Exception ex) {
@@ -112,7 +112,7 @@
public void localEntityGetEJBObject() {
context.getEJBObject();
}
-
+
public void localEntityGetEJBLocalObject() {
context.getEJBLocalObject();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java
index c73a23a..72a9423 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java
@@ -38,7 +38,7 @@
* @exception throws FinderException and RemoteException.
*
*/
-
- public LocalEntity findByPrimaryKey(String studentId)
+
+ public LocalEntity findByPrimaryKey(String studentId)
throws FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java
index ea3e28e..27afcc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java
@@ -24,7 +24,7 @@
public interface LocalStudent
extends EJBLocalObject
{
-
+
/**
* Returns the Name of a student.
* exception RemoteException
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java
index 85752f6..0a238f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -32,11 +32,11 @@
public ThereRemoteBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In ThereRemoteBean::ejbCreate !!");
+ System.out.println("In ThereRemoteBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void doSomethingHere() {
@@ -44,7 +44,7 @@
}
public void accessEJBObject() {
- sc.getEJBObject();
+ sc.getEJBObject();
}
public void accessEJBLocalObject() {
@@ -52,7 +52,7 @@
}
public void accessEJBHome() {
- sc.getEJBHome();
+ sc.getEJBHome();
}
public void accessEJBLocalHome() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.properties b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.properties
index 5f46524..f3468f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-allowedmethods-remove"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.xml b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.xml
index 3505938..75158cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,13 +46,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/Driver*.class,**/HereLocal*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -60,10 +60,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java
index 688f0b2..95a8618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,11 +37,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-allowedmethods-remove");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java
index 774accc..718eee8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -63,11 +63,11 @@
return false;
}
-
+
public void ejbRemove() throws RemoteException {}
public void ejbActivate() {}
public void ejbPassivate() {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java
index fd7c176..2ded14e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,21 +33,21 @@
public HereLocalBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In HereLocalBean::ejbCreate !!");
+ System.out.println("In HereLocalBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void test() {
- System.out.println("In HereLocalBean::test !!");
+ System.out.println("In HereLocalBean::test !!");
}
public void ejbRemove()
throws RemoteException
{
- System.out.println("In HereLocalBean::ejbRemove !!");
+ System.out.println("In HereLocalBean::ejbRemove !!");
}
public void ejbActivate() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/build.xml
index 5fa25f1..a78b382 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/build.xml
@@ -29,15 +29,15 @@
&reporting;
<target name="all">
- <antcall target="finder"/>
+ <antcall target="finder"/>
<antcall target="readonly"/>
- <antcall target="simple"/>
- <antcall target="simple_nopackage"/>
+ <antcall target="simple"/>
+ <antcall target="simple_nopackage"/>
<antcall target="twolevel"/>
- <antcall target="txtests"/>
- <antcall target="thread_pool_id"/>
+ <antcall target="txtests"/>
+ <antcall target="thread_pool_id"/>
<!-- These tests need to be fixed
- <antcall target="handle"/>
+ <antcall target="handle"/>
-->
</target>
@@ -91,19 +91,19 @@
</target>
<target name="usage">
- <echo>
- Usage:
+ <echo>
+ Usage:
ant all (Executes all the ejb-bmp tests)
ant finder
- ant handle
- ant readonly
- ant simple
+ ant handle
+ ant readonly
+ ant simple
ant simple_nopackage
- ant twolevel
- ant txtests
- ant thread_pool_id
-
- </echo>
+ ant twolevel
+ ant txtests
+ ant thread_pool_id
+
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.properties
index 30cd936..5018c1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-finder"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.xml
index 75cf674..d6a3f0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*Enroller*.class,**/*Course*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Course.class,**/Enroller.class,**/Student.class,**/*Home*.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -68,18 +68,18 @@
-->
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/client/FinderClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/client/FinderClient.java
index eee06da..d37af19 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/client/FinderClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/client/FinderClient.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
/**
- * A simple java client will:
+ * A simple java client will:
* <ul>
* <li>Locates the home interface of the enterprise bean
* <li>Gets a reference to the remote interface
@@ -36,11 +36,11 @@
private SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- public static void main(String[] args) {
- FinderClient client = new FinderClient();
+ public static void main(String[] args) {
+ FinderClient client = new FinderClient();
// run the tests
- client.runTestClient();
+ client.runTestClient();
}
public void runTestClient() {
@@ -60,12 +60,12 @@
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleCourse");
- CourseHome cHome =
- (CourseHome) PortableRemoteObject.narrow(objref,
+ CourseHome cHome =
+ (CourseHome) PortableRemoteObject.narrow(objref,
CourseHome.class);
objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
Course intro = cHome.findByPrimaryKey("777");
@@ -76,14 +76,14 @@
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
}
- }
+ }
private void test02() {
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleCourse");
- CourseHome cHome =
- (CourseHome) PortableRemoteObject.narrow(objref,
+ CourseHome cHome =
+ (CourseHome) PortableRemoteObject.narrow(objref,
CourseHome.class);
ArrayList list = cHome.findAllCourses();
@@ -94,6 +94,6 @@
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
}
- }
+ }
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml
index 825f577..fef372a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml
@@ -330,7 +330,7 @@
<method-params />
</method>
- <!-- methods for Student EJB -->
+ <!-- methods for Student EJB -->
<method>
<ejb-name>FinderStudentBean</ejb-name>
@@ -671,6 +671,6 @@
<trans-attribute>NotSupported</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java
index 3c3b739..34bc204 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java
@@ -22,24 +22,24 @@
public interface Course extends EJBObject {
-
+
/**
* Returns an arraylist of StudentIds taking the course.
- * @exception RemoteException
+ * @exception RemoteException
*/
public ArrayList getStudentIds() throws RemoteException;
/**
* Returns the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public String getName() throws RemoteException;
/**
* Sets the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public void setName(String name) throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java
index daf34c6..c6481ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java
@@ -89,7 +89,7 @@
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-finderDB");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/Enroller");
- enrollerHome =
+ enrollerHome =
(EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
} catch (Exception ex) {
@@ -235,7 +235,7 @@
con.close();
}
- private ArrayList selectAllCourses()
+ private ArrayList selectAllCourses()
throws SQLException {
String selectStatement =
@@ -243,7 +243,7 @@
"from FinderEnrollment ";
Connection con = dataSource.getConnection();
- Statement stmt =
+ Statement stmt =
con.createStatement();
ResultSet rs = stmt.executeQuery(selectStatement);
@@ -276,7 +276,7 @@
try {
// In BMP, can't get timer service or call timer service methods
- TimerService ts = context.getTimerService();
+ TimerService ts = context.getTimerService();
throw new EJBException("should have gotten timer service method " +
" illegal state exception ");
} catch(IllegalStateException ise) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java
index 1e5b712..b58f2ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java
@@ -30,13 +30,13 @@
*/
public Course create(String courseId, String name)
throws RemoteException, CreateException;
-
+
/**
* Gets a reference to the remote interface to the CourseBean object by Primary Key.
* @exception throws FinderException and RemoteException.
*
*/
- public Course findByPrimaryKey(String courseId)
+ public Course findByPrimaryKey(String courseId)
throws FinderException, RemoteException;
public java.util.ArrayList findAllCourses()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java
index 26bd031..c14d966 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java
@@ -21,7 +21,7 @@
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
-
+
/**
* Enrolls a Student in a course
* @param studentId primary key of the student object
@@ -40,7 +40,7 @@
public void unEnroll(String studentId, String courseId)
throws RemoteException;
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -49,7 +49,7 @@
throws RemoteException;
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java
index 44292d7..4932d79 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.finder.ejb;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
@@ -26,7 +26,7 @@
import java.io.*;
public class EnrollerBean implements SessionBean {
-
+
private Connection con;
private String dbName = "java:comp/env/jdbc/bmp-finderDB";
private SessionContext context;
@@ -61,7 +61,7 @@
}
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -74,7 +74,7 @@
}
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
@@ -164,7 +164,7 @@
String insertStatement =
"insert into FinderEnrollment values ( ? , ? )";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(insertStatement);
prepStmt.setString(1, studentId);
@@ -174,7 +174,7 @@
prepStmt.close();
}
- private void deleteEntry(String studentId, String courseId)
+ private void deleteEntry(String studentId, String courseId)
throws SQLException {
String deleteStatement =
@@ -217,13 +217,13 @@
prepStmt.close();
}
- private ArrayList selectStudent(String courseId)
+ private ArrayList selectStudent(String courseId)
throws SQLException {
String selectStatement =
"select studentid " +
"from FinderEnrollment where courseid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, courseId);
@@ -239,13 +239,13 @@
return a;
}
- private ArrayList selectCourse(String studentId)
+ private ArrayList selectCourse(String studentId)
throws SQLException {
String selectStatement =
"select courseid " +
"from FinderEnrollment where studentid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, studentId);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java
index c0b4153..d7f312b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java
@@ -22,9 +22,9 @@
public interface Student extends EJBObject {
-
+
/**
- * Returns the CourseIds that a student is enrolled in.
+ * Returns the CourseIds that a student is enrolled in.
* @param studentId primary key of the student object
* @param courseId primary key of the course object
* @exception RemoteException
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java
index 3310d76..4e70ec9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java
@@ -98,7 +98,7 @@
courseIds = new ArrayList();
try {
InitialContext ic = new InitialContext();
- dataSource =
+ dataSource =
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-finderDB");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/Enroller");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java
index 4925aa9..884da5d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java
@@ -36,7 +36,7 @@
* @exception throws FinderException and RemoteException.
*
*/
-
- public Student findByPrimaryKey(String studentId)
+
+ public Student findByPrimaryKey(String studentId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/create_pointbase.sql
index 2a88a12..3209ac1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/create_pointbase.sql
@@ -1,45 +1,45 @@
-create table FinderStudent
-(studentid varchar(3) constraint pk_FinderStudent primary key not null,
-name varchar(36));
-
-insert into FinderStudent
-values ('123', 'Sal Jones');
-insert into FinderStudent
-values ('221', 'Alice Smith');
-insert into FinderStudent
-values ('388', 'Elizabeth Willis');
-insert into FinderStudent
-values ('456', 'Joe Smith');
-
-
-create table FinderCourse
-(courseid varchar(3) constraint pk_FinderCourse primary key not null,
-name varchar(36));
-
-insert into FinderCourse
-values ('999', 'Advanced Java Programming');
-insert into FinderCourse
-values ('111', 'J2EE for Smart People');
-insert into FinderCourse
-values ('333', 'XML Made Easy');
-insert into FinderCourse
-values ('777', 'An Introduction to Java Programming');
-
-create table FinderEnrollment
-(studentid varchar(3),
-courseid varchar(3),
-constraint fk_studentid
-foreign key (studentid)
-references FinderStudent(studentid),
-constraint fk_courseid
-foreign key (courseid)
-references FinderCourse(courseid));
-
-insert into FinderEnrollment
-values ('123', '777');
-insert into FinderEnrollment
-values ('221', '777');
-insert into FinderEnrollment
-values ('388', '777');
-insert into FinderEnrollment
-values ('456', '777');
+create table FinderStudent
+(studentid varchar(3) constraint pk_FinderStudent primary key not null,
+name varchar(36));
+
+insert into FinderStudent
+values ('123', 'Sal Jones');
+insert into FinderStudent
+values ('221', 'Alice Smith');
+insert into FinderStudent
+values ('388', 'Elizabeth Willis');
+insert into FinderStudent
+values ('456', 'Joe Smith');
+
+
+create table FinderCourse
+(courseid varchar(3) constraint pk_FinderCourse primary key not null,
+name varchar(36));
+
+insert into FinderCourse
+values ('999', 'Advanced Java Programming');
+insert into FinderCourse
+values ('111', 'J2EE for Smart People');
+insert into FinderCourse
+values ('333', 'XML Made Easy');
+insert into FinderCourse
+values ('777', 'An Introduction to Java Programming');
+
+create table FinderEnrollment
+(studentid varchar(3),
+courseid varchar(3),
+constraint fk_studentid
+foreign key (studentid)
+references FinderStudent(studentid),
+constraint fk_courseid
+foreign key (courseid)
+references FinderCourse(courseid));
+
+insert into FinderEnrollment
+values ('123', '777');
+insert into FinderEnrollment
+values ('221', '777');
+insert into FinderEnrollment
+values ('388', '777');
+insert into FinderEnrollment
+values ('456', '777');
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/drop_pointbase.sql
index 136a556..326bb68 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/drop_pointbase.sql
@@ -1,3 +1,3 @@
-drop table FinderEnrollment;
-drop table FinderStudent;
-drop table FinderCourse;
+drop table FinderEnrollment;
+drop table FinderStudent;
+drop table FinderCourse;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/build.xml
index 0231fab..b092fc0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/build.xml
@@ -28,11 +28,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant mix (Executes the ejb-bm-handle mix tests)
- ant all (Executes all the ejb-bmp-handle tests)
- </echo>
+ <echo>
+ Usage:
+ ant mix (Executes the ejb-bm-handle mix tests)
+ ant all (Executes all the ejb-bmp-handle tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.properties
index be2b680..96d061b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-handle"/>
-<property name="appname" value="${module}-mix"/>
+<property name="appname" value="${module}-mix"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.xml
index d680a55..5940b3d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*Enroller*.class,**/*Course*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Course.class,**/Enroller.class,**/Student.class,**/*Home*.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -68,18 +68,18 @@
-->
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/client/HandleClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/client/HandleClient.java
index ee36835..a481b73 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/client/HandleClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/client/HandleClient.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
/**
- * A simple java client will:
+ * A simple java client will:
* <ul>
* <li>Locates the home interface of the enterprise bean
* <li>Gets a reference to the remote interface
@@ -36,11 +36,11 @@
private SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- public static void main(String[] args) {
- HandleClient client = new HandleClient();
+ public static void main(String[] args) {
+ HandleClient client = new HandleClient();
// run the tests
- client.runTestClient();
+ client.runTestClient();
}
public void runTestClient() {
@@ -50,15 +50,15 @@
Context initialCtx = new InitialContext();
Object objref = initialCtx.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome enrollerHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome enrollerHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
test02(initialCtx, enrollerHome);
test03(initialCtx, enrollerHome);
test04(initialCtx, enrollerHome);
test05(initialCtx, enrollerHome);
-
+
stat.printSummary("HandleClient");
} catch (Exception ex) {
System.out.println("Exception in runTestClient: " + ex.toString());
@@ -71,8 +71,8 @@
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
Student denise = sHome.create("823", "Denise Smith");
@@ -81,8 +81,8 @@
sHome.create("388", "A smart programmer");
objref = initial.lookup("java:comp/env/ejb/SimpleCourse");
- CourseHome cHome =
- (CourseHome) PortableRemoteObject.narrow(objref,
+ CourseHome cHome =
+ (CourseHome) PortableRemoteObject.narrow(objref,
CourseHome.class);
Course power = cHome.create("220", "Power J2EE Programming");
@@ -90,8 +90,8 @@
cHome.create("777", "Design Patterns");
objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
@@ -110,7 +110,7 @@
System.out.println(courseId + " " + course.getName());
}
System.out.println();
-
+
Course intro = cHome.findByPrimaryKey("777");
System.out.println(intro.getName() + ":");
courses = intro.getStudentIds();
@@ -120,14 +120,14 @@
Student student = sHome.findByPrimaryKey(studentId);
System.out.println(studentId + " " + student.getName());
}
-
+
stat.addStatus("Bmp HandleClient", stat.PASS);
} catch (Exception ex) {
stat.addStatus("Bmp HandleClient", stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
}
- }
+ }
private void test02(Context initialCtx, EnrollerHome enrollerHome) {
try {
@@ -181,4 +181,4 @@
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml
index d9222cd..e69d5d7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml
@@ -325,7 +325,7 @@
<method-params />
</method>
- <!-- methods for Student EJB -->
+ <!-- methods for Student EJB -->
<method>
<ejb-name>HandleStudentBean</ejb-name>
@@ -666,6 +666,6 @@
<trans-attribute>NotSupported</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java
index 1907a65..8db9217 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java
@@ -22,24 +22,24 @@
public interface Course extends EJBObject {
-
+
/**
* Returns an arraylist of StudentIds taking the course.
- * @exception RemoteException
+ * @exception RemoteException
*/
public ArrayList getStudentIds() throws RemoteException;
/**
* Returns the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public String getName() throws RemoteException;
/**
* Sets the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public void setName(String name) throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java
index 1687d68..86c8c81 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java
@@ -105,7 +105,7 @@
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-handle-mixDB");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/Enroller");
- enrollerHome =
+ enrollerHome =
(EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java
index d01c797..8fe23ff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java
@@ -30,12 +30,12 @@
*/
public Course create(String courseId, String name)
throws RemoteException, CreateException;
-
+
/**
* Gets a reference to the remote interface to the CourseBean object by Primary Key.
* @exception throws FinderException and RemoteException.
*
*/
- public Course findByPrimaryKey(String courseId)
+ public Course findByPrimaryKey(String courseId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java
index 0a580d4..c1fe1bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java
@@ -21,7 +21,7 @@
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
-
+
/**
* Enrolls a Student in a course
* @param studentId primary key of the student object
@@ -40,7 +40,7 @@
public void unEnroll(String studentId, String courseId)
throws RemoteException;
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -49,7 +49,7 @@
throws RemoteException;
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java
index 5c9d7b3..9af3fe5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
@@ -26,7 +26,7 @@
import java.io.*;
public class EnrollerBean implements SessionBean {
-
+
private Connection con;
private String dbName = "java:comp/env/jdbc/bmp-handle-mixDB";
private SessionContext context;
@@ -61,7 +61,7 @@
}
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -74,7 +74,7 @@
}
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
@@ -143,8 +143,8 @@
} catch (SQLException ex) {
throw new EJBException("ejbPassivate Exception: " + ex.getMessage());
} finally {
- con = null;
- }
+ con = null;
+ }
}
public void setSessionContext(SessionContext context) {
@@ -166,7 +166,7 @@
String insertStatement =
"insert into HandleEnrollment values ( ? , ? )";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(insertStatement);
prepStmt.setString(1, studentId);
@@ -176,7 +176,7 @@
prepStmt.close();
}
- private void deleteEntry(String studentId, String courseId)
+ private void deleteEntry(String studentId, String courseId)
throws SQLException {
String deleteStatement =
@@ -219,13 +219,13 @@
prepStmt.close();
}
- private ArrayList selectStudent(String courseId)
+ private ArrayList selectStudent(String courseId)
throws SQLException {
String selectStatement =
"select studentid " +
"from HandleEnrollment where courseid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, courseId);
@@ -241,13 +241,13 @@
return a;
}
- private ArrayList selectCourse(String studentId)
+ private ArrayList selectCourse(String studentId)
throws SQLException {
String selectStatement =
"select courseid " +
"from HandleEnrollment where studentid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, studentId);
@@ -303,7 +303,7 @@
Object objref = initial.lookup("java:comp/env/ejb/Student");
StudentHome studentHome =
(StudentHome) PortableRemoteObject.narrow(objref, StudentHome.class);
-
+
HomeHandle homeHandle = studentHome.getHomeHandle();
StringBuffer sbuf = new StringBuffer("BEGIN: testStudentHomeHandle");
HomeHandle retHomeHandle = doHomeHandleTest(homeHandle, sbuf, "testStudentHomeHandle");
@@ -324,7 +324,7 @@
Object objref = initial.lookup("java:comp/env/ejb/Student");
StudentHome studentHome =
(StudentHome) PortableRemoteObject.narrow(objref, StudentHome.class);
-
+
Student student = studentHome.findByPrimaryKey(studentID);
Handle handle = student.getHandle();
StringBuffer sbuf = new StringBuffer("BEGIN: testStudentHandle");
@@ -343,7 +343,7 @@
private HomeHandle doHomeHandleTest(HomeHandle handle, StringBuffer sbuf, String msg)
throws Exception
{
-
+
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(handle);
@@ -363,7 +363,7 @@
private Handle doHandleTest(Handle handle, StringBuffer sbuf, String msg)
throws Exception
{
-
+
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(handle);
@@ -380,7 +380,7 @@
return newHandle;
}
- private boolean isSame(HomeHandle h1, HomeHandle h2)
+ private boolean isSame(HomeHandle h1, HomeHandle h2)
throws RemoteException
{
EJBMetaData meta1 = h1.getEJBHome().getEJBMetaData();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java
index 088eef4..ec71b9a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java
@@ -22,9 +22,9 @@
public interface Student extends EJBObject {
-
+
/**
- * Returns the CourseIds that a student is enrolled in.
+ * Returns the CourseIds that a student is enrolled in.
* @param studentId primary key of the student object
* @param courseId primary key of the course object
* @exception RemoteException
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java
index 7367ef7..477ebe5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java
@@ -98,7 +98,7 @@
courseIds = new ArrayList();
try {
InitialContext ic = new InitialContext();
- dataSource =
+ dataSource =
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-handle-mixDB");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/Enroller");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java
index a255dca..e09d677 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java
@@ -36,7 +36,7 @@
* @exception throws FinderException and RemoteException.
*
*/
-
- public Student findByPrimaryKey(String studentId)
+
+ public Student findByPrimaryKey(String studentId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/sql/create_pointbase.sql
index 6fdfb2b..af4015d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/sql/create_pointbase.sql
@@ -1,15 +1,15 @@
Drop table HandleStudent;
create table HandleStudent
-(studentid varchar(3) primary key not null,
+(studentid varchar(3) primary key not null,
name varchar(36));
Drop table HandleCourse;
create table HandleCourse
-(courseid varchar(3) primary key not null,
+(courseid varchar(3) primary key not null,
name varchar(36));
Drop table HandleEnrollment;
create table HandleEnrollment
-(courseid varchar(3),
+(courseid varchar(3),
studentid varchar(36));
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.properties
index d273d8d..6e7c94c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-readonly"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.xml
index 2b00d83..5111402 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,23 +48,23 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*Enroller*.class,**/*Course*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Course.class,**/Enroller.class,**/Student.class,**/*Home*.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
-
+
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
- <antcall target="runclient-common">
+ <antcall target="runclient-common">
</antcall>
</target>
@@ -73,14 +73,14 @@
<param name="appclient.application.args" value="400 10 5 250"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java
index 2c87087..c398a41 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java
@@ -26,7 +26,7 @@
import jakarta.ejb.CreateException;
/**
- * A simple java client will:
+ * A simple java client will:
* <ul>
* <li>Locates the home interface of the enterprise bean
* <li>Gets a reference to the remote interface
@@ -43,9 +43,9 @@
private int numPKs_ = 1;
private long sleepTimeInMillis_ = 100;
- public static void main(String[] args) {
+ public static void main(String[] args) {
- ReadOnlyClient client = new ReadOnlyClient();
+ ReadOnlyClient client = new ReadOnlyClient();
if( args.length == 4 ) {
@@ -54,16 +54,16 @@
int numPKs = Integer.parseInt(args[2]);
long sleepTimeInMillis = Long.parseLong(args[3]);
client.runThreadTest(numIterations, numThreads, numPKs,
- sleepTimeInMillis);
+ sleepTimeInMillis);
} else {
- client.runTestClient();
+ client.runTestClient();
}
// run the tests
-
+
}
- public void runTestClient() {
+ public void runTestClient() {
try{
stat.addDescription("Testing Bmp ReadOnlyClient app.");
@@ -85,7 +85,7 @@
}
public void runThreadTest(int numIterations, int numThreads, int numPKs,
- long sleepTimeInMillis) {
+ long sleepTimeInMillis) {
numIterations_ = numIterations;
numThreads_ = numThreads;
@@ -93,7 +93,7 @@
sleepTimeInMillis_ = sleepTimeInMillis;
try{
- stat.addDescription("Bmp ReadOnlyClient thread test");
+ stat.addDescription("Bmp ReadOnlyClient thread test");
test12();
stat.printSummary("ReadOnlyClient");
} catch (Exception ex) {
@@ -106,8 +106,8 @@
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
try {
@@ -119,7 +119,7 @@
stat.addStatus("Bmp-ReadOnly Student ", stat.FAIL);
System.err.println("Caught an exception!");
ex.printStackTrace();
- //Expected
+ //Expected
}
} catch (Throwable th) {
System.err.println("Caught an unexpected exception!");
@@ -133,8 +133,8 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleCourse");
- CourseHome cHome =
- (CourseHome) PortableRemoteObject.narrow(objref,
+ CourseHome cHome =
+ (CourseHome) PortableRemoteObject.narrow(objref,
CourseHome.class);
try {
@@ -146,7 +146,7 @@
stat.addStatus("Bmp-ReadOnly Course ", stat.FAIL);
System.err.println("Caught an exception!");
ex.printStackTrace();
- //Expected
+ //Expected
}
} catch (Throwable th) {
System.err.println("Caught an unexpected exception!");
@@ -161,8 +161,8 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
@@ -180,15 +180,15 @@
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
}
- }
+ }
private void test04() {
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
@@ -227,8 +227,8 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
@@ -250,17 +250,17 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
boolean status = enroller.canGetReadOnlyBeanLocalNotifier(true);
if (status == true) {
- stat.addStatus("Bmp-ReadOnly SFSBLocal-NewNotifier ",
+ stat.addStatus("Bmp-ReadOnly SFSBLocal-NewNotifier ",
stat.PASS);
} else {
- stat.addStatus("Bmp-ReadOnly SFSBLocal-NewNotifier ",
+ stat.addStatus("Bmp-ReadOnly SFSBLocal-NewNotifier ",
stat.FAIL);
}
} catch (Exception ex) {
@@ -275,22 +275,22 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
- boolean status = enroller.testReadOnlyBeanLocalStudentRefresh("student0",
+ boolean status = enroller.testReadOnlyBeanLocalStudentRefresh("student0",
true);
if (status == true) {
- stat.addStatus("Bmp-ReadOnly SFSBLocal-NewStudentRefresh ",
+ stat.addStatus("Bmp-ReadOnly SFSBLocal-NewStudentRefresh ",
stat.PASS);
} else {
- stat.addStatus("Bmp-ReadOnly SFSBLocal-NewStudentRefresh ",
+ stat.addStatus("Bmp-ReadOnly SFSBLocal-NewStudentRefresh ",
stat.FAIL);
}
} catch (Exception ex) {
- stat.addStatus("Bmp-ReadOnly SFSBLocalNotifierRefresh ",
+ stat.addStatus("Bmp-ReadOnly SFSBLocalNotifierRefresh ",
stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
@@ -302,17 +302,17 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome readOnlyStudentHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome readOnlyStudentHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
objref = initial.lookup("java:comp/env/ejb/MutableStudent");
- StudentHomeMutable mutableStudentHome =
- (StudentHomeMutable) PortableRemoteObject.narrow(objref,
+ StudentHomeMutable mutableStudentHome =
+ (StudentHomeMutable) PortableRemoteObject.narrow(objref,
StudentHomeMutable.class);
Student newStudent = mutableStudentHome.create("999", "Joe Schmo");
- Student readOnlyStudent =
+ Student readOnlyStudent =
readOnlyStudentHome.findByPrimaryKey("999");
String name1 = newStudent.getName();
String readOnlyName1 = readOnlyStudent.getName();
@@ -343,9 +343,9 @@
// to create a new instance of the bean and call ejbLoad on it.
// So, only use name1 and name2 to decide if test passed.
if (name1.equals(readOnlyName1) && name2.equals(readOnlyName2) &&
- name1.equals(readOnlyName1Tx) &&
+ name1.equals(readOnlyName1Tx) &&
name2.equals(readOnlyName2Tx)) {
-
+
stat.addStatus("Bmp-ReadOnly ReadMostly ", stat.PASS);
} else {
stat.addStatus("Bmp-ReadOnly ReadMostly ", stat.FAIL);
@@ -357,7 +357,7 @@
stat.addStatus("Bmp-ReadOnly ReadMostly ", stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
- }
+ }
}
private void test12() {
@@ -366,7 +366,7 @@
System.out.println("Num Iterations = " + numIterations_);
System.out.println("Num Threads = " + numThreads_);
System.out.println("Num PKs = " + numPKs_);
- System.out.println("Sleep time in milliseconds = " +
+ System.out.println("Sleep time in milliseconds = " +
sleepTimeInMillis_);
int numWriterIterations = numIterations_ / 100;
@@ -374,34 +374,34 @@
System.out.println("Num writer iterations = " +
numWriterIterations);
- System.out.println("Writer sleep time in milliseconds = " +
+ System.out.println("Writer sleep time in milliseconds = " +
writerSleepTimeInMillis);
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome readOnlyStudentHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome readOnlyStudentHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
objref = initial.lookup("java:comp/env/ejb/MutableStudent");
- StudentHomeMutable mutableStudentHome =
- (StudentHomeMutable) PortableRemoteObject.narrow(objref,
+ StudentHomeMutable mutableStudentHome =
+ (StudentHomeMutable) PortableRemoteObject.narrow(objref,
StudentHomeMutable.class);
-
+
Student[] newStudents = new Student[numPKs_];
Student[] readOnlyStudents = new Student[numPKs_];
Thread[] readers = new Thread[numThreads_ * numPKs_];
Thread[] writers = new Thread[numPKs_];
for(int i = 0; i < numPKs_; i++) {
- newStudents[i] =
+ newStudents[i] =
mutableStudentHome.create("ReaderThread" + i, "ABC" + i);
- readOnlyStudents[i] =
+ readOnlyStudents[i] =
readOnlyStudentHome.findByPrimaryKey("ReaderThread" + i);
- System.out.println("Creating student " +
+ System.out.println("Creating student " +
readOnlyStudents[i].getPrimaryKey());
- writers[i] = new WriterThread(newStudents[i],
+ writers[i] = new WriterThread(newStudents[i],
numWriterIterations,
writerSleepTimeInMillis);
for(int j = 0; j < numThreads_; j++) {
@@ -409,21 +409,21 @@
int threadIndex = i*numThreads_ + j;
System.out.println("Thread index = " + threadIndex);
readers[threadIndex] = new ReaderThread
- (readOnlyStudents[i], numIterations_,
+ (readOnlyStudents[i], numIterations_,
sleepTimeInMillis_);
}
}
-
+
for(int i = 0; i < readers.length; i++) {
System.out.println("Starting reader thread " + i);
readers[i].start();
- }
-
+ }
+
for(int i = 0; i < writers.length; i++) {
System.out.println("Starting writer thread " + i);
writers[i].start();
- }
-
+ }
+
System.out.println("Joining on " + readers.length + " readers");
for(int i = 0; i < readers.length; i++) {
readers[i].join();
@@ -432,8 +432,8 @@
for(int i = 0; i < writers.length; i++) {
writers[i].join();
}
-
-
+
+
stat.addStatus("Bmp-ReadOnly ReaderThreads ", stat.PASS);
System.out.println("Removing all students");
@@ -445,24 +445,24 @@
stat.addStatus("Bmp-ReadOnly ReaderThreads ", stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
- }
+ }
}
private class ReaderThread extends Thread {
- Student readOnlyStudent_;
+ Student readOnlyStudent_;
int numReads_;
long sleepTimeInMillis_;
- String studentPK_;
+ String studentPK_;
- ReaderThread(Student readOnlyStudent, int numReads,
+ ReaderThread(Student readOnlyStudent, int numReads,
long sleepTimeInMillis) {
- readOnlyStudent_ = readOnlyStudent;
+ readOnlyStudent_ = readOnlyStudent;
numReads_ = numReads;
sleepTimeInMillis_ = sleepTimeInMillis;
}
- public void run() {
+ public void run() {
for( int i = 0; i < numReads_; i++) {
try {
if( i == 0 ) {
@@ -482,20 +482,20 @@
private class WriterThread extends Thread {
- Student mutableStudent_;
+ Student mutableStudent_;
int numWrites_;
long sleepTimeInMillis_;
String studentPK_;
- WriterThread(Student mutableStudent, int numWrites,
+ WriterThread(Student mutableStudent, int numWrites,
long sleepTimeInMillis) {
- mutableStudent_ = mutableStudent;
+ mutableStudent_ = mutableStudent;
numWrites_ = numWrites;
sleepTimeInMillis_ = sleepTimeInMillis;
}
- public void run() {
- for( int i = 0; i < numWrites_; i++) {
+ public void run() {
+ for( int i = 0; i < numWrites_; i++) {
try {
if( i == 0 ) {
studentPK_ = (String) mutableStudent_.getPrimaryKey();
@@ -514,4 +514,4 @@
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml
index a1921fa..991ad84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml
@@ -368,7 +368,7 @@
<method-params />
</method>
- <!-- methods for Student EJB -->
+ <!-- methods for Student EJB -->
<method>
<ejb-name>ReadOnlyStudentBean</ejb-name>
@@ -929,6 +929,6 @@
<trans-attribute>NotSupported</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java
index e75ee64..05903fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java
@@ -22,24 +22,24 @@
public interface Course extends EJBObject {
-
+
/**
* Returns an arraylist of StudentIds taking the course.
- * @exception RemoteException
+ * @exception RemoteException
*/
public ArrayList getStudentIds() throws RemoteException;
/**
* Returns the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public String getName() throws RemoteException;
/**
* Sets the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public void setName(String name) throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java
index f59e86b..c467939 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java
@@ -105,7 +105,7 @@
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-readonlyDB");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/Enroller");
- enrollerHome =
+ enrollerHome =
(EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java
index a75e2df..8060ddb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java
@@ -30,12 +30,12 @@
*/
public Course create(String courseId, String name)
throws RemoteException, CreateException;
-
+
/**
* Gets a reference to the remote interface to the CourseBean object by Primary Key.
* @exception throws FinderException and RemoteException.
*
*/
- public Course findByPrimaryKey(String courseId)
+ public Course findByPrimaryKey(String courseId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java
index 48f0fd4..aaedf82 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java
@@ -21,7 +21,7 @@
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
-
+
/**
* Enrolls a Student in a course
* @param studentId primary key of the student object
@@ -40,7 +40,7 @@
public void unEnroll(String studentId, String courseId)
throws RemoteException;
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -49,7 +49,7 @@
throws RemoteException;
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java
index e1d41cb..b8d3773 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.readonly.ejb;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
@@ -26,7 +26,7 @@
import java.io.*;
public class EnrollerBean implements SessionBean {
-
+
private Connection con;
private String dbName = "java:comp/env/jdbc/bmp-readonlyDB";
private DataSource ds;
@@ -62,7 +62,7 @@
}
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -75,7 +75,7 @@
}
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
@@ -127,11 +127,11 @@
}
public void ejbActivate() {
-
+
}
public void ejbPassivate() {
-
+
}
public void setSessionContext(SessionContext context) {
@@ -140,14 +140,14 @@
public EnrollerBean() {}
- /*********************** Database Routines *************************/
+ /*********************** Database Routines *************************/
private void insertEntry(String studentId, String courseId)
throws SQLException {
Connection con = ds.getConnection();
String insertStatement =
"insert into ReadOnlyEnrollment values ( ? , ? )";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(insertStatement);
prepStmt.setString(1, studentId);
@@ -158,7 +158,7 @@
con.close();
}
- private void deleteEntry(String studentId, String courseId)
+ private void deleteEntry(String studentId, String courseId)
throws SQLException {
Connection con = ds.getConnection();
@@ -207,14 +207,14 @@
con.close();
}
- private ArrayList selectStudent(String courseId)
+ private ArrayList selectStudent(String courseId)
throws SQLException {
Connection con = ds.getConnection();
String selectStatement =
"select studentid " +
"from ReadOnlyEnrollment where courseid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, courseId);
@@ -231,14 +231,14 @@
return a;
}
- private ArrayList selectCourse(String studentId)
+ private ArrayList selectCourse(String studentId)
throws SQLException {
Connection con = ds.getConnection();
String selectStatement =
"select courseid " +
"from ReadOnlyEnrollment where studentid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, studentId);
@@ -283,7 +283,7 @@
}
return status;
}
-
+
public boolean testReadOnlyBeanLocalCreate(String studentId, String name) {
boolean status = false;
@@ -293,13 +293,13 @@
studentLocalHome.create(studentId, name);
System.out.println("Error. Should have gotten CreateException in"
- + " testReadOnlyBeanLocalCreate");
+ + " testReadOnlyBeanLocalCreate");
} catch(CreateException ce) {
System.out.println("Successfully got CreateException when " +
"attempting to create a read-only bean");
status = true;
} catch(Exception e) {
- System.out.println("Got unexpected exception in " +
+ System.out.println("Got unexpected exception in " +
"testReadOnlyBeanLocalCreate");
e.printStackTrace();
}
@@ -316,7 +316,7 @@
com.sun.appserv.ejb.ReadOnlyBeanNotifier
notifier = com.sun.appserv.ejb.ReadOnlyBeanHelper.
getReadOnlyBeanNotifier("java:comp/env/ejb/Student");
-
+
notifier.refresh(studentId);
status = true;
} else {
@@ -324,7 +324,7 @@
}
} catch (Exception ex) {
System.err.println("******* testReadOnlyBeanStudentRefresh ****");
- ex.printStackTrace();
+ ex.printStackTrace();
System.err.println("******* testReadOnlyBeanStudentRefresh ****");
}
@@ -341,7 +341,7 @@
com.sun.appserv.ejb.ReadOnlyBeanLocalNotifier
notifier = com.sun.appserv.ejb.ReadOnlyBeanHelper.
getReadOnlyBeanLocalNotifier("java:comp/env/ejb/StudentLocal");
-
+
notifier.refresh(studentId);
status = true;
} else {
@@ -349,7 +349,7 @@
}
} catch (Exception ex) {
System.err.println("******* testReadOnlyBeanLocalStudentRefresh ****");
- ex.printStackTrace();
+ ex.printStackTrace();
System.err.println("******* testReadOnlyBeanLocalStudentRefresh ****");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java
index 0e508b2..f0bb27e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java
@@ -22,9 +22,9 @@
public interface Student extends EJBObject {
-
+
/**
- * Returns the CourseIds that a student is enrolled in.
+ * Returns the CourseIds that a student is enrolled in.
* @param studentId primary key of the student object
* @param courseId primary key of the course object
* @exception RemoteException
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java
index 245d425..1234819 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java
@@ -69,10 +69,10 @@
try {
System.out.println("Notifying read-only bean of update to " +
"read-mostly Student " + name);
- ReadOnlyBeanNotifier studentNotifier =
+ ReadOnlyBeanNotifier studentNotifier =
ReadOnlyBeanHelper.getReadOnlyBeanNotifier
("java:comp/env/ejb/ReadOnlyStudent");
-
+
// Update read-only version
studentNotifier.refresh(studentId);
} catch(Exception e) {
@@ -123,7 +123,7 @@
courseIds = new ArrayList();
try {
InitialContext ic = new InitialContext();
- dataSource =
+ dataSource =
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-readonlyDB");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/Enroller");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java
index 5b8c498..cda97ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java
@@ -36,7 +36,7 @@
* @exception throws FinderException and RemoteException.
*
*/
-
- public Student findByPrimaryKey(String studentId)
+
+ public Student findByPrimaryKey(String studentId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java
index 7d2fd28..d05703c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java
@@ -20,12 +20,12 @@
import jakarta.ejb.EJBLocalObject;
public interface StudentLocal extends EJBLocalObject {
-
+
/**
- * Returns the CourseIds that a student is enrolled in.
+ * Returns the CourseIds that a student is enrolled in.
* @param studentId primary key of the student object
* @param courseId primary key of the course object
- *
+ *
*/
public ArrayList getCourseIds();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java
index c79588f..7fca5c2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java
@@ -36,7 +36,7 @@
* @exception throws FinderException.
*
*/
-
- public Student findByPrimaryKey(String studentId)
+
+ public Student findByPrimaryKey(String studentId)
throws FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/create_pointbase.sql
index f7af5c8..7ee9fcf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/create_pointbase.sql
@@ -1,45 +1,45 @@
-create table ReadOnlyStudent
-(studentid varchar(15) constraint pk_ReadOnlystudent primary key not null,
-name varchar(36));
-
-insert into ReadOnlyStudent
-values ('student0', 'Student_ID_0');
-insert into ReadOnlyStudent
-values ('student1', 'Student_ID_1');
-insert into ReadOnlyStudent
-values ('student2', 'Student_ID_2');
-insert into ReadOnlyStudent
-values ('student3', 'Student_ID_3');
-insert into ReadOnlyStudent
-values ('student4', 'Student_ID_4');
-insert into ReadOnlyStudent
-values ('student5', 'Student_ID_5');
-
-
-create table ReadOnlyCourse
-(courseid varchar(15) constraint pk_ReadOnlycourse primary key not null,
-name varchar(36));
-
-insert into ReadOnlyCourse
-values ('course0', 'Course_ID_0');
-insert into ReadOnlyCourse
-values ('course1', 'Course_ID_1');
-insert into ReadOnlyCourse
-values ('course2', 'Course_ID_2');
-insert into ReadOnlyCourse
-values ('course3', 'Course_ID_3');
-insert into ReadOnlyCourse
-values ('course4', 'Course_ID_4');
-insert into ReadOnlyCourse
-values ('course5', 'Course_ID_5');
-
-create table ReadOnlyEnrollment
-(studentid varchar(15),
-courseid varchar(15),
-constraint fk_studentid
-foreign key (studentid)
-references ReadOnlystudent(studentid),
-constraint fk_courseid
-foreign key (courseid)
-references ReadOnlycourse(courseid));
-
+create table ReadOnlyStudent
+(studentid varchar(15) constraint pk_ReadOnlystudent primary key not null,
+name varchar(36));
+
+insert into ReadOnlyStudent
+values ('student0', 'Student_ID_0');
+insert into ReadOnlyStudent
+values ('student1', 'Student_ID_1');
+insert into ReadOnlyStudent
+values ('student2', 'Student_ID_2');
+insert into ReadOnlyStudent
+values ('student3', 'Student_ID_3');
+insert into ReadOnlyStudent
+values ('student4', 'Student_ID_4');
+insert into ReadOnlyStudent
+values ('student5', 'Student_ID_5');
+
+
+create table ReadOnlyCourse
+(courseid varchar(15) constraint pk_ReadOnlycourse primary key not null,
+name varchar(36));
+
+insert into ReadOnlyCourse
+values ('course0', 'Course_ID_0');
+insert into ReadOnlyCourse
+values ('course1', 'Course_ID_1');
+insert into ReadOnlyCourse
+values ('course2', 'Course_ID_2');
+insert into ReadOnlyCourse
+values ('course3', 'Course_ID_3');
+insert into ReadOnlyCourse
+values ('course4', 'Course_ID_4');
+insert into ReadOnlyCourse
+values ('course5', 'Course_ID_5');
+
+create table ReadOnlyEnrollment
+(studentid varchar(15),
+courseid varchar(15),
+constraint fk_studentid
+foreign key (studentid)
+references ReadOnlystudent(studentid),
+constraint fk_courseid
+foreign key (courseid)
+references ReadOnlycourse(courseid));
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/drop_pointbase.sql
index 6b0a6e4..8067490 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/drop_pointbase.sql
@@ -1,3 +1,3 @@
-drop table ReadOnlyEnrollment;
-drop table ReadOnlyStudent;
-drop table ReadOnlyCourse;
+drop table ReadOnlyEnrollment;
+drop table ReadOnlyStudent;
+drop table ReadOnlyCourse;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.properties
index 3feb379..9668068 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-simple"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.xml
index a78fa40..93a24bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,34 +48,34 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/client/SimpleBMPClient.java
index 5f0749e..e4bdca5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/client/SimpleBMPClient.java
@@ -35,19 +35,19 @@
{
try {
stat.addDescription("Testing bmp simple app.");
- InitialContext ic = new InitialContext();
+ InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
-
+
int id= (int) System.currentTimeMillis();
- System.out.println("Starting test for id: " + id);
- SimpleBMP simpleBMP = simpleBMPHome.create(id);
- simpleBMP.foo();
-
+ System.out.println("Starting test for id: " + id);
+ SimpleBMP simpleBMP = simpleBMPHome.create(id);
+ simpleBMP.foo();
+
SimpleBMP bean = simpleBMPHome.findByPrimaryKey(new Integer(id));
- simpleBMP.foo();
- System.out.println("Done for id: " + id);
+ simpleBMP.foo();
+ System.out.println("Done for id: " + id);
stat.addStatus("bmp simple", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/descriptor/ejb-jar.xml
index fae4e84..cfe0d69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/descriptor/ejb-jar.xml
@@ -55,6 +55,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java
index b5eb26d..e619bc9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java
@@ -31,148 +31,148 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate(int i) throws CreateException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
- ps.setInt(1, i);
- ps.setString(2, "550-1212");
- if (ps.executeUpdate() != 1)
- throw new CreateException("Didnt create ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
+ ps.setInt(1, i);
+ ps.setString(2, "550-1212");
+ if (ps.executeUpdate() != 1)
+ throw new CreateException("Didnt create ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbCreate....");
- } catch (SQLException e) {
- throw new CreateException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
- id = i;
- return new Integer(i);
+ } catch (SQLException e) {
+ throw new CreateException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
+ id = i;
+ return new Integer(i);
}
public boolean isServicedBy(String threadPoolID) {
System.out.println("[**SimpleBMPBean**] "
- + ". Request serviced by:" + Thread.currentThread());
+ + ". Request serviced by:" + Thread.currentThread());
String threadID = Thread.currentThread().toString().toLowerCase();
- return (threadID.indexOf(threadPoolID.toLowerCase()) != -1);
+ return (threadID.indexOf(threadPoolID.toLowerCase()) != -1);
}
public void foo() {
System.out.println("[**SimpleBMPBean**] ["
- + Thread.currentThread() + "] Done with foo....");
+ + Thread.currentThread() + "] Done with foo....");
}
public Integer ejbFindByPrimaryKey(Integer key) throws FinderException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, key.intValue());
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new FinderException("No cust for " + id);
- String phone = rs.getString(1);
- return key;
- } catch (SQLException e) {
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, key.intValue());
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new FinderException("No cust for " + id);
+ String phone = rs.getString(1);
+ return key;
+ } catch (SQLException e) {
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbLoad() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, id);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + id);
- String phone = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, id);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + id);
+ String phone = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
- ps.setString(1, "550-1212");
- ps.setInt(2, id);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
+ ps.setString(1, "550-1212");
+ ps.setInt(2, id);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbStore....");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM O_customer WHERE c_id = ?");
- ps.setInt(1, id);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM O_customer WHERE c_id = ?");
+ ps.setInt(1, id);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/create_pointbase.sql
index e4914f6..f256076 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.properties
index 1cf3c76..cc90249 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-simple_nopackage"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.xml
index 59aabb9..05bc931 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Test.class, **/TestHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -68,21 +68,21 @@
-->
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/ejb-jar.xml
index 58b34ae..161e383 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/ejb-jar.xml
@@ -20,28 +20,28 @@
<ejb-jar>
<enterprise-beans>
- <entity>
- <ejb-name>Test</ejb-name>
- <home>TestHome</home>
- <remote>Test</remote>
- <ejb-class>TestBMP</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.Integer</prim-key-class>
- <reentrant>False</reentrant>
- <resource-ref>
- <res-ref-name>DataSource</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
- </entity>
+ <entity>
+ <ejb-name>Test</ejb-name>
+ <home>TestHome</home>
+ <remote>Test</remote>
+ <ejb-class>TestBMP</ejb-class>
+ <persistence-type>Bean</persistence-type>
+ <prim-key-class>java.lang.Integer</prim-key-class>
+ <reentrant>False</reentrant>
+ <resource-ref>
+ <res-ref-name>DataSource</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ </entity>
</enterprise-beans>
<assembly-descriptor>
<container-transaction>
- <method>
- <ejb-name>Test</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
+ <method>
+ <ejb-name>Test</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/sun-ejb-jar.xml
index 3f74e4c..76e57e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/sun-ejb-jar.xml
@@ -24,8 +24,8 @@
<ejb-name>Test</ejb-name>
<jndi-name>ejb/Test</jndi-name>
<resource-ref>
- <res-ref-name>DataSource</res-ref-name>
- <jndi-name>jdbc/__default</jndi-name>
+ <res-ref-name>DataSource</res-ref-name>
+ <jndi-name>jdbc/__default</jndi-name>
</resource-ref>
<pass-by-reference>false</pass-by-reference>
<is-read-only-bean>false</is-read-only-bean>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java
index 029a59b..c2f4986 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java
@@ -27,40 +27,40 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
}
public Integer ejbCreate(int i) throws CreateException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
- ps.setInt(1, i);
- ps.setString(2, "550-1212");
- if (ps.executeUpdate() != 1)
- throw new CreateException("Didnt create ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
+ ps.setInt(1, i);
+ ps.setString(2, "550-1212");
+ if (ps.executeUpdate() != 1)
+ throw new CreateException("Didnt create ejb");
System.out.println("[TestBMP] Done ejbCreate()....");
- } catch (SQLException e) {
- throw new CreateException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
- id = i;
- return new Integer(i);
+ } catch (SQLException e) {
+ throw new CreateException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
+ id = i;
+ return new Integer(i);
}
public void foo() {
@@ -68,100 +68,100 @@
}
public Integer ejbFindByPrimaryKey(int i) throws FinderException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, i);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new FinderException("No cust for " + id);
- String phone = rs.getString(1);
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, i);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new FinderException("No cust for " + id);
+ String phone = rs.getString(1);
System.out.println("[TestBMP] Done ejbFindByPrimaryKey()....");
- return new Integer(i);
- } catch (SQLException e) {
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ return new Integer(i);
+ } catch (SQLException e) {
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbLoad() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, id);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + id);
- String phone = rs.getString(1);
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, id);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + id);
+ String phone = rs.getString(1);
System.out.println("[TestBMP] Done ejbLoad()....");
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
- ps.setString(1, "550-1212");
- ps.setInt(2, id);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
+ ps.setString(1, "550-1212");
+ ps.setInt(2, id);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
System.out.println("[TestBMP] Done ejbStore()....");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM O_customer WHERE c_id = ?");
- ps.setInt(1, id);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM O_customer WHERE c_id = ?");
+ ps.setInt(1, id);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/create_pointbase.sql
index e4914f6..f256076 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.properties
index 03b394d..ff3103b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-thread-pool-id"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.xml
index 1ae0cc2..e5b8c9c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,52 +48,52 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
- <echo message="asadmin create-threadpool ${as.props} express-service-thread-pool"/>
- <exec executable="${ASADMIN}" >
- <arg line="create-threadpool "/>
- <arg line="${as.props}"/>
- <arg line="express-service-thread-pool"/>
- </exec>
- <antcall target="restart-server-instance-common"/>
- <!--<exec executable="${ASADMIN}" >
- <arg line="stop-domain"/>
- </exec>
- <exec executable="${ASADMIN}" >
- <arg line="start-domain"/>
- </exec>-->
+ <echo message="asadmin create-threadpool ${as.props} express-service-thread-pool"/>
+ <exec executable="${ASADMIN}" >
+ <arg line="create-threadpool "/>
+ <arg line="${as.props}"/>
+ <arg line="express-service-thread-pool"/>
+ </exec>
+ <antcall target="restart-server-instance-common"/>
+ <!--<exec executable="${ASADMIN}" >
+ <arg line="stop-domain"/>
+ </exec>
+ <exec executable="${ASADMIN}" >
+ <arg line="start-domain"/>
+ </exec>-->
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- <echo message="asadmin delete-threadpool ${as.props} express-service-thread-pool"/>
- <exec executable="${ASADMIN}" >
- <arg line="delete-threadpool "/>
- <arg line="${as.props}"/>
- <arg line="express-service-thread-pool"/>
- </exec>
- <antcall target="restart-server-instance-common"/>
+ <echo message="asadmin delete-threadpool ${as.props} express-service-thread-pool"/>
+ <exec executable="${ASADMIN}" >
+ <arg line="delete-threadpool "/>
+ <arg line="${as.props}"/>
+ <arg line="express-service-thread-pool"/>
+ </exec>
+ <antcall target="restart-server-instance-common"/>
<!--
<antcall target="undeploy-jdbc-common">
@@ -102,7 +102,7 @@
</antcall>
-->
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/client/SimpleBMPClient.java
index 5e6ed8c..7136e4f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/client/SimpleBMPClient.java
@@ -35,19 +35,19 @@
{
try {
stat.addDescription("Testing bmp simple app.");
- InitialContext ic = new InitialContext();
+ InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
-
- int id= (int) System.currentTimeMillis();
- System.out.println("Starting test for id: " + id);
- SimpleBMP simpleBMP = simpleBMPHome.create(id);
- boolean threadPoolIDTestStatus =
- simpleBMP.isServicedBy("express-service-thread-pool");
+ int id= (int) System.currentTimeMillis();
+ System.out.println("Starting test for id: " + id);
+ SimpleBMP simpleBMP = simpleBMPHome.create(id);
+
+ boolean threadPoolIDTestStatus =
+ simpleBMP.isServicedBy("express-service-thread-pool");
stat.addStatus("bmp ThreadPoolTest",
- ((threadPoolIDTestStatus == true) ? stat.PASS : stat.FAIL));
+ ((threadPoolIDTestStatus == true) ? stat.PASS : stat.FAIL));
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("bmp simple", stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/descriptor/ejb-jar.xml
index fae4e84..cfe0d69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/descriptor/ejb-jar.xml
@@ -55,6 +55,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java
index b5eb26d..e619bc9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java
@@ -31,148 +31,148 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate(int i) throws CreateException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
- ps.setInt(1, i);
- ps.setString(2, "550-1212");
- if (ps.executeUpdate() != 1)
- throw new CreateException("Didnt create ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
+ ps.setInt(1, i);
+ ps.setString(2, "550-1212");
+ if (ps.executeUpdate() != 1)
+ throw new CreateException("Didnt create ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbCreate....");
- } catch (SQLException e) {
- throw new CreateException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
- id = i;
- return new Integer(i);
+ } catch (SQLException e) {
+ throw new CreateException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
+ id = i;
+ return new Integer(i);
}
public boolean isServicedBy(String threadPoolID) {
System.out.println("[**SimpleBMPBean**] "
- + ". Request serviced by:" + Thread.currentThread());
+ + ". Request serviced by:" + Thread.currentThread());
String threadID = Thread.currentThread().toString().toLowerCase();
- return (threadID.indexOf(threadPoolID.toLowerCase()) != -1);
+ return (threadID.indexOf(threadPoolID.toLowerCase()) != -1);
}
public void foo() {
System.out.println("[**SimpleBMPBean**] ["
- + Thread.currentThread() + "] Done with foo....");
+ + Thread.currentThread() + "] Done with foo....");
}
public Integer ejbFindByPrimaryKey(Integer key) throws FinderException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, key.intValue());
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new FinderException("No cust for " + id);
- String phone = rs.getString(1);
- return key;
- } catch (SQLException e) {
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, key.intValue());
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new FinderException("No cust for " + id);
+ String phone = rs.getString(1);
+ return key;
+ } catch (SQLException e) {
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbLoad() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, id);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + id);
- String phone = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, id);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + id);
+ String phone = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
- ps.setString(1, "550-1212");
- ps.setInt(2, id);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
+ ps.setString(1, "550-1212");
+ ps.setInt(2, id);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbStore....");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM O_customer WHERE c_id = ?");
- ps.setInt(1, id);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM O_customer WHERE c_id = ?");
+ ps.setInt(1, id);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/create_pointbase.sql
index e4914f6..f256076 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.properties
index 0eba91b..0a63f26 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-twolevel"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.xml
index a887fe9..f600c3f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/StatelessHome.class, **/Stateless.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -68,21 +68,21 @@
-->
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/client/TwoLevelClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/client/TwoLevelClient.java
index 9e592f9..7a38712 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/client/TwoLevelClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/client/TwoLevelClient.java
@@ -35,21 +35,21 @@
{
try {
stat.addDescription("Testing bmp twolevel app.");
- InitialContext ic = new InitialContext();
+ InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/StatelessHome");
- StatelessHome statelessHome = (StatelessHome)
+ StatelessHome statelessHome = (StatelessHome)
javax.rmi.PortableRemoteObject.narrow(objRef, StatelessHome.class);
- Stateless stateless = statelessHome.create();
-
+ Stateless stateless = statelessHome.create();
+
int id= (int) System.currentTimeMillis();
- System.out.println("Starting test for id: " + id);
- stateless.createBMP(new Integer(id));
- System.out.println("Done for id: " + id);
-
- System.out.println("Starting test for id: " + id+1);
- stateless.createBMPAndTest(new Integer(id+1));
- System.out.println("Done for id: " + id+1);
+ System.out.println("Starting test for id: " + id);
+ stateless.createBMP(new Integer(id));
+ System.out.println("Done for id: " + id);
+
+ System.out.println("Starting test for id: " + id+1);
+ stateless.createBMPAndTest(new Integer(id+1));
+ System.out.println("Done for id: " + id+1);
stat.addStatus("bmp twolevel", stat.PASS);
} catch(Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/descriptor/ejb-jar.xml
index 34e654e..b2fd97b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/descriptor/ejb-jar.xml
@@ -80,6 +80,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java
index 6326b5b..15aae1e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java
@@ -31,41 +31,41 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate(int i) throws CreateException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
- ps.setInt(1, i);
- ps.setString(2, "550-1212");
- if (ps.executeUpdate() != 1)
- throw new CreateException("Didnt create ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
+ ps.setInt(1, i);
+ ps.setString(2, "550-1212");
+ if (ps.executeUpdate() != 1)
+ throw new CreateException("Didnt create ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbCreate....");
- } catch (SQLException e) {
- throw new CreateException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
- id = i;
- return new Integer(i);
+ } catch (SQLException e) {
+ throw new CreateException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
+ id = i;
+ return new Integer(i);
}
public void foo() {
@@ -73,98 +73,98 @@
}
public Integer ejbFindByPrimaryKey(Integer key) throws FinderException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, key.intValue());
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new FinderException("No cust for " + id);
- String phone = rs.getString(1);
- return key;
- } catch (SQLException e) {
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, key.intValue());
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new FinderException("No cust for " + id);
+ String phone = rs.getString(1);
+ return key;
+ } catch (SQLException e) {
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbLoad() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, id);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + id);
- String phone = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, id);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + id);
+ String phone = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
- ps.setString(1, "550-1212");
- ps.setInt(2, id);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
+ ps.setString(1, "550-1212");
+ ps.setInt(2, id);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbStore....");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM O_customer WHERE c_id = ?");
- ps.setInt(1, id);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM O_customer WHERE c_id = ?");
+ ps.setInt(1, id);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java
index 3cc403e..265831d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java
@@ -34,14 +34,14 @@
public void setSessionContext(SessionContext sessionContext) {
this.sessionContext = sessionContext;
- Context context = null;
- try {
- context = new InitialContext();
- Object objRef = context.lookup("java:comp/env/ejb/SimpleBMPHome");
- bmpHome = (SimpleBMPHome) PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
- } catch (NamingException e) {
- throw new EJBException("cant find SimpleBMPHome");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ Object objRef = context.lookup("java:comp/env/ejb/SimpleBMPHome");
+ bmpHome = (SimpleBMPHome) PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
+ } catch (NamingException e) {
+ throw new EJBException("cant find SimpleBMPHome");
+ }
}
public void createBMP(Integer key)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/create_pointbase.sql
index e4914f6..f256076 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/build.xml
index 66ec503..485fad7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/build.xml
@@ -30,10 +30,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
+ <echo>
+ Usage:
ant all (Executes all the ejb-bmp txtests tests)
-
- </echo>
+
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.properties
index c3aa55d..513652b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-txtests-simple"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.xml
index ac976b1..6039d4d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,34 +48,34 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/CustomerInfo.class, **/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/client/SimpleBMPClient.java
index 6d8a907..386406f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/client/SimpleBMPClient.java
@@ -35,19 +35,19 @@
{
try {
stat.addDescription("Testing txtests simple app.");
- InitialContext ic = new InitialContext();
+ InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
-
+
int id= (int) System.currentTimeMillis();
- System.out.println("Starting test for id: " + id);
- SimpleBMP simpleBMP = simpleBMPHome.create(id);
- simpleBMP.getID();
-
+ System.out.println("Starting test for id: " + id);
+ SimpleBMP simpleBMP = simpleBMPHome.create(id);
+ simpleBMP.getID();
+
SimpleBMP bean = simpleBMPHome.findByPrimaryKey(new Integer(id));
- simpleBMP.getID();
- System.out.println("Done for id: " + id);
+ simpleBMP.getID();
+ System.out.println("Done for id: " + id);
stat.addStatus("txtests simple", stat.PASS);
} catch(Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/descriptor/ejb-jar.xml
index af908be..47cf417 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/descriptor/ejb-jar.xml
@@ -55,6 +55,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java
index e171eab..531c2f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java
@@ -35,12 +35,12 @@
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Entered setEntityContext....");
this.entityContext = entityContext;
- try {
- Context context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ try {
+ Context context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Done with setEntityContext....");
}
@@ -49,31 +49,31 @@
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Entered ejbCreate(" + i + ")....");
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
- ps.setInt(1, i);
- ps.setString(2, "Phone_" + i);
- if (ps.executeUpdate() != 1) {
- throw new CreateException("Didnt create ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
+ ps.setInt(1, i);
+ ps.setString(2, "Phone_" + i);
+ if (ps.executeUpdate() != 1) {
+ throw new CreateException("Didnt create ejb");
}
- } catch (SQLException e) {
- throw new CreateException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
- id = i;
+ } catch (SQLException e) {
+ throw new CreateException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
+ id = i;
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Done with ejbCreate(" + i + ")....");
- return new Integer(i);
+ return new Integer(i);
}
public int getID() {
@@ -92,56 +92,56 @@
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Entered ejbFindByPrimaryKey(" + key.intValue() + ")....");
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, key.intValue());
- ResultSet rs = ps.executeQuery();
- if (!rs.next()) {
- throw new FinderException("No cust for " + id);
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, key.intValue());
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next()) {
+ throw new FinderException("No cust for " + id);
}
- } catch (SQLException e) {
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " DONE ejbFindByPrimaryKey(" + key.intValue() + ")....");
- return key;
+ return key;
}
public void ejbLoad() {
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Entered ejbLoad()....");
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, id);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + id);
- String phone = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, id);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + id);
+ String phone = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " DONE ejbLoad()....");
}
@@ -149,27 +149,27 @@
public void ejbStore() {
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Entered ejbStore()....");
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
- ps.setString(1, "550-1212");
- ps.setInt(2, id);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
+ ps.setString(1, "550-1212");
+ ps.setInt(2, id);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbStore....");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " DONE ejbStore()....");
}
@@ -177,25 +177,25 @@
public void ejbRemove() throws RemoveException {
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Entered ejbRemove()....");
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM O_customer WHERE c_id = ?");
- ps.setInt(1, id);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM O_customer WHERE c_id = ?");
+ ps.setInt(1, id);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " DONE ejbRemove()....");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/create_pointbase.sql
index 2c4cb65..231209d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(26)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(26)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.properties
index 24f681b..f403c0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-txtests-stateless"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.xml
index c527320..0c46002 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,14 +48,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class, **/*SLSB*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -67,7 +67,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -79,14 +79,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
index f28da27..ca6d030 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
@@ -32,8 +32,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private SLSBHome home;
@@ -46,11 +46,11 @@
client.doTest();
System.out.println("[txtests] DONE doTest()...");
stat.printSummary("txtests");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
initSLSB(); //create MAX_TIMERS
@@ -106,4 +106,4 @@
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java
index 65d066a..80ca7bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java
@@ -22,7 +22,7 @@
extends EJBObject
{
- public boolean doRollbackTest(int id)
+ public boolean doRollbackTest(int id)
throws java.rmi.RemoteException;
public boolean doReturnParamTest(int id)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java
index 2ddf9ab..e2c855f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java
@@ -26,18 +26,18 @@
import javax.rmi.PortableRemoteObject;
public class SLSBEJB
- implements SessionBean
+ implements SessionBean
{
- private SessionContext sessionCtx;
+ private SessionContext sessionCtx;
- public void ejbCreate() {}
+ public void ejbCreate() {}
- public void setSessionContext(SessionContext sc) {
- sessionCtx = sc;
- }
+ public void setSessionContext(SessionContext sc) {
+ sessionCtx = sc;
+ }
- // business method to create a timer
- public boolean doRollbackTest(int id) {
+ // business method to create a timer
+ public boolean doRollbackTest(int id) {
boolean retVal = false;
boolean doneRollback = false;
try {
@@ -48,7 +48,7 @@
sessionCtx.getUserTransaction().begin();
entityHome.create(id);
-
+
//This must be non null
SimpleBMP entity = (SimpleBMP)
entityHome.findByPrimaryKey(new Integer(id));
@@ -78,8 +78,8 @@
}
}
- return retVal;
- }
+ return retVal;
+ }
public boolean doReturnParamTest(int id) {
@@ -92,7 +92,7 @@
sessionCtx.getUserTransaction().begin();
entityHome.create(id);
-
+
//This must be non null
SimpleBMP entity = (SimpleBMP)
entityHome.findByPrimaryKey(new Integer(id));
@@ -104,7 +104,7 @@
CustomerInfo customerInfo = entity.getCustomerInfo();
retVal = (foundID == customerInfo.getCustomerID());
-
+
} catch (Throwable th) {
th.printStackTrace();
} finally {
@@ -114,13 +114,13 @@
}
}
- return retVal;
- }
+ return retVal;
+ }
- public void ejbRemove() {}
+ public void ejbRemove() {}
- public void ejbActivate() {}
+ public void ejbActivate() {}
- public void ejbPassivate() {}
+ public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java
index 9c332eb..ea84e23 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java
@@ -23,6 +23,6 @@
public interface SLSBHome
extends EJBHome
{
- SLSB create()
+ SLSB create()
throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/build.xml
index 27c51c1..f114883 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/build.xml
@@ -42,17 +42,17 @@
<target name="all">
- <antcall target="setup"/>
- <antcall target="test-all"/>
- <antcall target="unsetup"/>
+ <antcall target="setup"/>
+ <antcall target="test-all"/>
+ <antcall target="unsetup"/>
<antcall target="report"/>
</target>
<target name="lite">
- <antcall target="setup"/>
- <antcall target="test-lite"/>
- <antcall target="unsetup"/>
+ <antcall target="setup"/>
+ <antcall target="test-lite"/>
+ <antcall target="unsetup"/>
<antcall target="report-lite"/>
</target>
@@ -81,7 +81,7 @@
<target name="setup">
- <antcall target="start-database"/>
+ <antcall target="start-database"/>
<ant target="startDomain"/>
<ant target="clean-result"/>
@@ -108,16 +108,16 @@
<ant dir="stubs" target="all"/>
<ant dir="txprop" target="all"/>
- <ant dir="ejbc" target="all"/>
+ <ant dir="ejbc" target="all"/>
<ant dir="ejb30" target="all"/>
- <ant dir="mdb" target="all"/>
+ <ant dir="mdb" target="all"/>
<ant dir="cli" target="all"/>
<ant dir="timer" target="all"/>
- <ant dir="bmp" target="all"/>
- <ant dir="cmp" target="all"/>
+ <ant dir="bmp" target="all"/>
+ <ant dir="cmp" target="all"/>
<ant dir="sfsb" target="all"/>
- <ant dir="allowedmethods" target="all"/>
- <ant dir="jms" target="all"/>
+ <ant dir="allowedmethods" target="all"/>
+ <ant dir="jms" target="all"/>
<ant dir="ejb32" target="all"/>
<!-- disable as it fails on hudson ...
-->
@@ -158,7 +158,7 @@
<echo message="Stopping app server instance"/>
<ant target="stopDomain"/>
- <antcall target="stop-database"/>
+ <antcall target="stop-database"/>
<record name="ejb.output" action="stop" />
@@ -166,30 +166,30 @@
</target>
<target name="orb_integration">
- <ant dir="ejb30" target="clientview"/>
- <ant dir="ejb30" target="hello"/>
+ <ant dir="ejb30" target="clientview"/>
+ <ant dir="ejb30" target="hello"/>
<ant dir="ejbc" target="all"/>
- <ant dir="txprop" target="all"/>
- <ant dir="stubs" target="all"/>
- <ant dir="bmp" target="txtests"/>
+ <ant dir="txprop" target="all"/>
+ <ant dir="stubs" target="all"/>
+ <ant dir="bmp" target="txtests"/>
<!-- gradually reenable the existing tests as features come on line
- <ant dir="bmp" target="handle"/>
+ <ant dir="bmp" target="handle"/>
-->
</target>
<target name="start-database" depends="init-common">
<echo message="Starting database --dbport ${db.port}"/>
- <!-- spawn is added to prevent a hang on Windows -->
- <exec spawn="true" executable="${ASADMIN}" failonerror="false">
+ <!-- spawn is added to prevent a hang on Windows -->
+ <exec spawn="true" executable="${ASADMIN}" failonerror="false">
<arg line="start-database --dbport ${db.port}"/>
- </exec>
+ </exec>
</target>
<target name="stop-database" depends="init-common">
<echo message="Stopping database --dbport ${db.port}"/>
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="false">
<arg line="stop-database --dbport ${db.port}"/>
- </exec>
+ </exec>
</target>
<target name="report-result" depends="init-common">
@@ -258,7 +258,7 @@
<record name="stubs.output" action="stop" />
<antcall target="report"/>
</target>
-
+
<target name="timer">
<record name="timer.output" action="start" />
<ant dir="timer" target="all"/>
@@ -296,23 +296,23 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb tests)
+ <echo>
+ Usage:
+ ant all (Executes all the ejb tests)
ant orb_integration (Executes all ejb-related orb integration tests
- ant allowedmethods (Executes the ejb allowedmethods tests)
- ant bmp (Executes the ejb bmp tests)
- ant ejbc (Executes the ejb ejbc tests)
- ant jms (Executes the ejb jms tests)
- ant mdb (Executes the ejb mdb tests)
- ant stubs (Executes the ejb stubs tests)
- ant timer (Executes the ejb timer tests)
- ant txprop (Executes the ejb txprop tests)
- ant sfsb (Executes the ejb sfsb tests)
- ant stress (Executes the ejb stress tests)
- ant ejb30 (Executes the ejb30 tests)
- ant ejb31 (Executes the ejb31 tests)
- </echo>
+ ant allowedmethods (Executes the ejb allowedmethods tests)
+ ant bmp (Executes the ejb bmp tests)
+ ant ejbc (Executes the ejb ejbc tests)
+ ant jms (Executes the ejb jms tests)
+ ant mdb (Executes the ejb mdb tests)
+ ant stubs (Executes the ejb stubs tests)
+ ant timer (Executes the ejb timer tests)
+ ant txprop (Executes the ejb txprop tests)
+ ant sfsb (Executes the ejb sfsb tests)
+ ant stress (Executes the ejb stress tests)
+ ant ejb30 (Executes the ejb30 tests)
+ ant ejb31 (Executes the ejb31 tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.properties b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.properties
index 3397861..791a806 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-classload-lifecycle"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.xml b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.xml
index 55cdf02..54ec6c6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,17 +47,17 @@
<target name="build" depends="compile">
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping.xml"/>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class,GoogleMapping.xml,META-INF/wsdl/**" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo.class,**/*FooHome.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -65,10 +65,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java
index 4b94bf3..bf24525 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,31 +37,31 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-classload-lifecycleID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/foo");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Foo f = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
f.callHello();
@@ -76,8 +76,8 @@
e.printStackTrace();
stat.addStatus("ejbclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/descriptor/ejb-jar.xml
index 12bfde4..0971453 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/descriptor/ejb-jar.xml
@@ -35,7 +35,7 @@
<wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
<jaxrpc-mapping-file>GoogleMapping.xml</jaxrpc-mapping-file>
<service-qname xmlns:servicens="urn:GoogleSearch">servicens:GoogleSearchService
- </service-qname>
+ </service-qname>
</service-ref>
<service-ref>
<description>google service ref</description>
@@ -44,7 +44,7 @@
<wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
<jaxrpc-mapping-file>GoogleMapping.xml</jaxrpc-mapping-file>
<service-qname xmlns:servicens="urn:GoogleSearch">servicens:GoogleSearchService
- </service-qname>
+ </service-qname>
</service-ref>
<security-identity>
<use-caller-identity/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/DirectoryCategory.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/DirectoryCategory.java
index eb45d26..bea6a33 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/DirectoryCategory.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/DirectoryCategory.java
@@ -24,27 +24,27 @@
public class DirectoryCategory {
protected java.lang.String fullViewableName;
protected java.lang.String specialEncoding;
-
+
public DirectoryCategory() {
}
-
+
public DirectoryCategory(java.lang.String fullViewableName, java.lang.String specialEncoding) {
this.fullViewableName = fullViewableName;
this.specialEncoding = specialEncoding;
}
-
+
public java.lang.String getFullViewableName() {
return fullViewableName;
}
-
+
public void setFullViewableName(java.lang.String fullViewableName) {
this.fullViewableName = fullViewableName;
}
-
+
public java.lang.String getSpecialEncoding() {
return specialEncoding;
}
-
+
public void setSpecialEncoding(java.lang.String specialEncoding) {
this.specialEncoding = specialEncoding;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java
index a92bc1b..b2310e7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -34,7 +34,7 @@
public FooBean() {}
public void ejbCreate() {
- System.out.println("In FooBean::ejbCreate()");
+ System.out.println("In FooBean::ejbCreate()");
try {
InitialContext ic = new InitialContext();
Service service = (Service) ic.lookup("java:comp/env/service/GoogleSearch_ejbCreate");
@@ -48,8 +48,8 @@
}
public void setSessionContext(SessionContext sc) {
- System.out.println("In FooBean::setSessionContext()");
- this.sc = sc;
+ System.out.println("In FooBean::setSessionContext()");
+ this.sc = sc;
}
public void callHello() {
@@ -57,7 +57,7 @@
}
public void ejbRemove() {
- System.out.println("In FooBean::ejbRemove()");
+ System.out.println("In FooBean::ejbRemove()");
try {
InitialContext ic = new InitialContext();
Service service = (Service) ic.lookup("java:comp/env/service/GoogleSearch_ejbRemove");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort.java
index afd0a6775..beb040e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort.java
@@ -21,10 +21,10 @@
package com.sun.s1asdev.ejb.classload.lifecycle;
public interface GoogleSearchPort extends java.rmi.Remote {
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) throws
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) throws
java.rmi.RemoteException;
- public java.lang.String doSpellingSuggestion(java.lang.String key, java.lang.String phrase) throws
+ public java.lang.String doSpellingSuggestion(java.lang.String key, java.lang.String phrase) throws
java.rmi.RemoteException;
- public com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) throws
+ public com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) throws
java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_Impl.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_Impl.java
index 1aa73e0..47d734a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_Impl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_Impl.java
@@ -17,21 +17,21 @@
package com.sun.s1asdev.ejb.classload.lifecycle;
public class GoogleSearchPort_Impl implements com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchPort, java.rmi.Remote {
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) throws
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) throws
java.rmi.RemoteException {
-
+
byte[] _retVal = null;
return _retVal;
}
- public java.lang.String doSpellingSuggestion(java.lang.String key, java.lang.String phrase) throws
+ public java.lang.String doSpellingSuggestion(java.lang.String key, java.lang.String phrase) throws
java.rmi.RemoteException {
-
+
java.lang.String _retVal = null;
return _retVal;
}
- public com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) throws
+ public com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) throws
java.rmi.RemoteException {
-
+
com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult _retVal = null;
return _retVal;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_RequestStruct.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_RequestStruct.java
index 7cfdacc..00edff8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_RequestStruct.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_RequestStruct.java
@@ -24,27 +24,27 @@
public class GoogleSearchPort_doGetCachedPage_RequestStruct {
protected java.lang.String key;
protected java.lang.String url;
-
+
public GoogleSearchPort_doGetCachedPage_RequestStruct() {
}
-
+
public GoogleSearchPort_doGetCachedPage_RequestStruct(java.lang.String key, java.lang.String url) {
this.key = key;
this.url = url;
}
-
+
public java.lang.String getKey() {
return key;
}
-
+
public void setKey(java.lang.String key) {
this.key = key;
}
-
+
public java.lang.String getUrl() {
return url;
}
-
+
public void setUrl(java.lang.String url) {
this.url = url;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_ResponseStruct.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_ResponseStruct.java
index ad841c1..f80fd04 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_ResponseStruct.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_ResponseStruct.java
@@ -23,18 +23,18 @@
public class GoogleSearchPort_doGetCachedPage_ResponseStruct {
protected byte[] _return;
-
+
public GoogleSearchPort_doGetCachedPage_ResponseStruct() {
}
-
+
public GoogleSearchPort_doGetCachedPage_ResponseStruct(byte[] _return) {
this._return = _return;
}
-
+
public byte[] get_return() {
return _return;
}
-
+
public void set_return(byte[] _return) {
this._return = _return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_RequestStruct.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_RequestStruct.java
index 968cbfc..206f3e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_RequestStruct.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_RequestStruct.java
@@ -32,10 +32,10 @@
protected java.lang.String lr;
protected java.lang.String ie;
protected java.lang.String oe;
-
+
public GoogleSearchPort_doGoogleSearch_RequestStruct() {
}
-
+
public GoogleSearchPort_doGoogleSearch_RequestStruct(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) {
this.key = key;
this.q = q;
@@ -48,83 +48,83 @@
this.ie = ie;
this.oe = oe;
}
-
+
public java.lang.String getKey() {
return key;
}
-
+
public void setKey(java.lang.String key) {
this.key = key;
}
-
+
public java.lang.String getQ() {
return q;
}
-
+
public void setQ(java.lang.String q) {
this.q = q;
}
-
+
public int getStart() {
return start;
}
-
+
public void setStart(int start) {
this.start = start;
}
-
+
public int getMaxResults() {
return maxResults;
}
-
+
public void setMaxResults(int maxResults) {
this.maxResults = maxResults;
}
-
+
public boolean isFilter() {
return filter;
}
-
+
public void setFilter(boolean filter) {
this.filter = filter;
}
-
+
public java.lang.String getRestrict() {
return restrict;
}
-
+
public void setRestrict(java.lang.String restrict) {
this.restrict = restrict;
}
-
+
public boolean isSafeSearch() {
return safeSearch;
}
-
+
public void setSafeSearch(boolean safeSearch) {
this.safeSearch = safeSearch;
}
-
+
public java.lang.String getLr() {
return lr;
}
-
+
public void setLr(java.lang.String lr) {
this.lr = lr;
}
-
+
public java.lang.String getIe() {
return ie;
}
-
+
public void setIe(java.lang.String ie) {
this.ie = ie;
}
-
+
public java.lang.String getOe() {
return oe;
}
-
+
public void setOe(java.lang.String oe) {
this.oe = oe;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_ResponseStruct.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_ResponseStruct.java
index c0b4503..194bf92 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_ResponseStruct.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_ResponseStruct.java
@@ -23,18 +23,18 @@
public class GoogleSearchPort_doGoogleSearch_ResponseStruct {
protected com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult _return;
-
+
public GoogleSearchPort_doGoogleSearch_ResponseStruct() {
}
-
+
public GoogleSearchPort_doGoogleSearch_ResponseStruct(com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult _return) {
this._return = _return;
}
-
+
public com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult get_return() {
return _return;
}
-
+
public void set_return(com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult _return) {
this._return = _return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_RequestStruct.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_RequestStruct.java
index 208146b..6f5d2c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_RequestStruct.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_RequestStruct.java
@@ -24,27 +24,27 @@
public class GoogleSearchPort_doSpellingSuggestion_RequestStruct {
protected java.lang.String key;
protected java.lang.String phrase;
-
+
public GoogleSearchPort_doSpellingSuggestion_RequestStruct() {
}
-
+
public GoogleSearchPort_doSpellingSuggestion_RequestStruct(java.lang.String key, java.lang.String phrase) {
this.key = key;
this.phrase = phrase;
}
-
+
public java.lang.String getKey() {
return key;
}
-
+
public void setKey(java.lang.String key) {
this.key = key;
}
-
+
public java.lang.String getPhrase() {
return phrase;
}
-
+
public void setPhrase(java.lang.String phrase) {
this.phrase = phrase;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_ResponseStruct.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_ResponseStruct.java
index 1b56041..05432d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_ResponseStruct.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_ResponseStruct.java
@@ -23,18 +23,18 @@
public class GoogleSearchPort_doSpellingSuggestion_ResponseStruct {
protected java.lang.String _return;
-
+
public GoogleSearchPort_doSpellingSuggestion_ResponseStruct() {
}
-
+
public GoogleSearchPort_doSpellingSuggestion_ResponseStruct(java.lang.String _return) {
this._return = _return;
}
-
+
public java.lang.String get_return() {
return _return;
}
-
+
public void set_return(java.lang.String _return) {
this._return = _return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchResult.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchResult.java
index 241981f..8351abc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchResult.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchResult.java
@@ -33,10 +33,10 @@
protected java.lang.String searchTips;
protected com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory[] directoryCategories;
protected double searchTime;
-
+
public GoogleSearchResult() {
}
-
+
public GoogleSearchResult(boolean documentFiltering, java.lang.String searchComments, int estimatedTotalResultsCount, boolean estimateIsExact, com.sun.s1asdev.ejb.classload.lifecycle.ResultElement[] resultElements, java.lang.String searchQuery, int startIndex, int endIndex, java.lang.String searchTips, com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory[] directoryCategories, double searchTime) {
this.documentFiltering = documentFiltering;
this.searchComments = searchComments;
@@ -50,91 +50,91 @@
this.directoryCategories = directoryCategories;
this.searchTime = searchTime;
}
-
+
public boolean isDocumentFiltering() {
return documentFiltering;
}
-
+
public void setDocumentFiltering(boolean documentFiltering) {
this.documentFiltering = documentFiltering;
}
-
+
public java.lang.String getSearchComments() {
return searchComments;
}
-
+
public void setSearchComments(java.lang.String searchComments) {
this.searchComments = searchComments;
}
-
+
public int getEstimatedTotalResultsCount() {
return estimatedTotalResultsCount;
}
-
+
public void setEstimatedTotalResultsCount(int estimatedTotalResultsCount) {
this.estimatedTotalResultsCount = estimatedTotalResultsCount;
}
-
+
public boolean isEstimateIsExact() {
return estimateIsExact;
}
-
+
public void setEstimateIsExact(boolean estimateIsExact) {
this.estimateIsExact = estimateIsExact;
}
-
+
public com.sun.s1asdev.ejb.classload.lifecycle.ResultElement[] getResultElements() {
return resultElements;
}
-
+
public void setResultElements(com.sun.s1asdev.ejb.classload.lifecycle.ResultElement[] resultElements) {
this.resultElements = resultElements;
}
-
+
public java.lang.String getSearchQuery() {
return searchQuery;
}
-
+
public void setSearchQuery(java.lang.String searchQuery) {
this.searchQuery = searchQuery;
}
-
+
public int getStartIndex() {
return startIndex;
}
-
+
public void setStartIndex(int startIndex) {
this.startIndex = startIndex;
}
-
+
public int getEndIndex() {
return endIndex;
}
-
+
public void setEndIndex(int endIndex) {
this.endIndex = endIndex;
}
-
+
public java.lang.String getSearchTips() {
return searchTips;
}
-
+
public void setSearchTips(java.lang.String searchTips) {
this.searchTips = searchTips;
}
-
+
public com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory[] getDirectoryCategories() {
return directoryCategories;
}
-
+
public void setDirectoryCategories(com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory[] directoryCategories) {
this.directoryCategories = directoryCategories;
}
-
+
public double getSearchTime() {
return searchTime;
}
-
+
public void setSearchTime(double searchTime) {
this.searchTime = searchTime;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/ResultElement.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/ResultElement.java
index 291df88..32c7879 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/ResultElement.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/ResultElement.java
@@ -31,10 +31,10 @@
protected java.lang.String hostName;
protected com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory directoryCategory;
protected java.lang.String directoryTitle;
-
+
public ResultElement() {
}
-
+
public ResultElement(java.lang.String summary, java.lang.String URL, java.lang.String snippet, java.lang.String title, java.lang.String cachedSize, boolean relatedInformationPresent, java.lang.String hostName, com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory directoryCategory, java.lang.String directoryTitle) {
this.summary = summary;
this.URL = URL;
@@ -46,75 +46,75 @@
this.directoryCategory = directoryCategory;
this.directoryTitle = directoryTitle;
}
-
+
public java.lang.String getSummary() {
return summary;
}
-
+
public void setSummary(java.lang.String summary) {
this.summary = summary;
}
-
+
public java.lang.String getURL() {
return URL;
}
-
+
public void setURL(java.lang.String URL) {
this.URL = URL;
}
-
+
public java.lang.String getSnippet() {
return snippet;
}
-
+
public void setSnippet(java.lang.String snippet) {
this.snippet = snippet;
}
-
+
public java.lang.String getTitle() {
return title;
}
-
+
public void setTitle(java.lang.String title) {
this.title = title;
}
-
+
public java.lang.String getCachedSize() {
return cachedSize;
}
-
+
public void setCachedSize(java.lang.String cachedSize) {
this.cachedSize = cachedSize;
}
-
+
public boolean isRelatedInformationPresent() {
return relatedInformationPresent;
}
-
+
public void setRelatedInformationPresent(boolean relatedInformationPresent) {
this.relatedInformationPresent = relatedInformationPresent;
}
-
+
public java.lang.String getHostName() {
return hostName;
}
-
+
public void setHostName(java.lang.String hostName) {
this.hostName = hostName;
}
-
+
public com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory getDirectoryCategory() {
return directoryCategory;
}
-
+
public void setDirectoryCategory(com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory directoryCategory) {
this.directoryCategory = directoryCategory;
}
-
+
public java.lang.String getDirectoryTitle() {
return directoryTitle;
}
-
+
public void setDirectoryTitle(java.lang.String directoryTitle) {
this.directoryTitle = directoryTitle;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cli/build.xml
index 44c130d..4b4df5a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/build.xml
@@ -40,11 +40,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-cli tests)
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-cli tests)
- ant negative (Executes the ejb-cli negative test)
- </echo>
+ ant negative (Executes the ejb-cli negative test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.properties b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.properties
index 8d1c287..742cc5a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-cli-negative"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.xml
index f394341..a478e1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.xml
@@ -45,7 +45,7 @@
<arg line="${assemble.dir}/${appname}App.ear"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
@@ -56,19 +56,19 @@
</antcall>
<antcall target="compile-client"/>
<antcall target="build-ear-common">
- <param name="application.xml"
+ <param name="application.xml"
value="descriptor/application.xml" />
- <param name="application-client.xml"
+ <param name="application-client.xml"
value="descriptor/application-client.xml" />
</antcall>
</target>
<target name="compile-client" >
- <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
+ <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/*BaseDevTest.java">
</javac>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar:${s1astest.classpath}"
destdir="${build.classes.dir}" debug="true" srcdir="client" includes="**/*.java">
<classpath path="${classpath}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/AppClient.java b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/AppClient.java
index 3600b1c..b5949c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/AppClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/AppClient.java
@@ -23,7 +23,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
/**
- * A simple java client will:
+ * A simple java client will:
* <ul>
* <li>Locates the remote interface of the enterprise bean
* <li>Invokes business methods
@@ -34,11 +34,11 @@
private SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- public static void main(String[] args) {
- AppClient client = new AppClient();
+ public static void main(String[] args) {
+ AppClient client = new AppClient();
// run the tests
- client.runTestClient();
+ client.runTestClient();
}
public void runTestClient() {
@@ -57,8 +57,8 @@
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/MyBean");
- MyBeanRemoteIntf mybean =
- (MyBeanRemoteIntf) PortableRemoteObject.narrow(objref,
+ MyBeanRemoteIntf mybean =
+ (MyBeanRemoteIntf) PortableRemoteObject.narrow(objref,
MyBeanRemoteIntf.class);
System.out.println("invocation result: "+ mybean.getCount(1));
stat.addStatus("ejb-cli", stat.FAIL);
@@ -67,5 +67,5 @@
System.err.println("caught expected exception");
ex.printStackTrace();
}
- }
-}
+ }
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/NegClient.java b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/NegClient.java
index c7adb13..8ffe89a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/NegClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/NegClient.java
@@ -53,9 +53,9 @@
if (!ret.returnValue && ret.err.contains(expectedErr)) {
stat.addStatus("ejb-cli-negative-deploy", stat.PASS);
} else {
- stat.addStatus("ejb-cli-negative-deploy", stat.FAIL);
+ stat.addStatus("ejb-cli-negative-deploy", stat.FAIL);
}
-
+
//System.out.println(ret);
} catch (Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java
index 2671c71..dc20245 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java
@@ -23,4 +23,4 @@
public int getCount(int i) {
return 1 + i;
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java
index c975953..cd61b73 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java
@@ -21,4 +21,4 @@
@Remote
public interface MyBeanRemoteIntf {
public int getCount(int i);
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/build.xml
index 17d434e..f865ea6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/build.xml
@@ -46,11 +46,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant readonly (Executes the ejb-cmp-readonly test)
- ant ejbflushwithsqlexception (Executes the ejb-cmp-ejbflushwithsqlexception test)
- ant all (Executes all the ejb-cmp tests)
- </echo>
+ <echo>
+ Usage:
+ ant readonly (Executes the ejb-cmp-readonly test)
+ ant ejbflushwithsqlexception (Executes the ejb-cmp-ejbflushwithsqlexception test)
+ ant all (Executes all the ejb-cmp tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.properties b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.properties
index b71e79c..ebf0dec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-flush-test"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="sun-cmp-mappings.xml" value="descriptor/sun-cmp-mappings.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.xml
index f54032a..0725cc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/TestHome.class,**/Test.class,**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -64,23 +64,23 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="deleteRows" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/delete_tables.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant all
</echo>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/client/Client.java
index 5998200..eb0031d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/client/Client.java
@@ -40,7 +40,7 @@
public class Client {
private Test t;
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -50,7 +50,7 @@
Object objref = initial.lookup("java:comp/env/ejb/T1");
TestHome thome = (TestHome)PortableRemoteObject.narrow(objref, TestHome.class);
-
+
t = thome.create();
} catch( Exception ex ) {
System.err.println("Client(): Caught an exception:");
@@ -59,7 +59,7 @@
}
public static void main(String[] args) {
-
+
try {
System.out.println("START");
@@ -78,7 +78,7 @@
stat.printSummary("ejbFlush");
}
-
+
private void checkCmp11Bean() {
try {
t.testA1();
@@ -93,7 +93,7 @@
try {
t.testA1WithFlush();
System.out.println("A1WithFlush OK");
- } catch (Exception e) {
+ } catch (Exception e) {
System.out.println("A1 FAILED " + e.getMessage());
e.printStackTrace();
stat.addStatus("ejbclient checkCmp11Bean", stat.FAIL);
@@ -152,7 +152,7 @@
try {
t.testA2WithFlush();
System.out.println("A2WithFlush OK");
- } catch (Exception e) {
+ } catch (Exception e) {
System.out.println("A2 FAILED " + e.getMessage());
e.printStackTrace();
stat.addStatus("ejbclient checkCmp20Bean", stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java
index b5b7e32..0bc5ea0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java
@@ -20,64 +20,64 @@
import javax.naming.*;
/**
- * 1.1 bean.
+ * 1.1 bean.
* @author mvatkina
*/
public class A1Bean implements jakarta.ejb.EntityBean {
-
+
private jakarta.ejb.EntityContext context;
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
*/
public void setEntityContext(jakarta.ejb.EntityContext aContext) {
context=aContext;
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbActivate()
*/
public void ejbActivate() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbPassivate()
*/
public void ejbPassivate() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbRemove()
*/
public void ejbRemove() {
System.out.println("Debug: A1Bean ejbRemove");
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#unsetEntityContext()
*/
public void unsetEntityContext() {
context=null;
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbLoad()
*/
public void ejbLoad() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbStore()
*/
@@ -93,8 +93,8 @@
name = "ABC";
return null;
}
-
- public void ejbPostCreate(java.lang.String id) throws jakarta.ejb.CreateException {
+
+ public void ejbPostCreate(java.lang.String id) throws jakarta.ejb.CreateException {
}
public void setName(String s) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java
index bd56f6d..ea34dd4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java
@@ -24,9 +24,9 @@
public interface A1Local extends jakarta.ejb.EJBLocalObject {
- public void setName(String name);
+ public void setName(String name);
- public void setNameWithFlush(String name);
+ public void setNameWithFlush(String name);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java
index 9057982..a6cf40c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java
@@ -24,9 +24,9 @@
*/
public interface A1LocalHome extends jakarta.ejb.EJBLocalHome {
-
+
public A1Local findByPrimaryKey(java.lang.String pk) throws jakarta.ejb.FinderException;
-
+
public A1Local create(java.lang.String id) throws jakarta.ejb.CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java
index 28cc6b5..2adfb37 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java
@@ -20,64 +20,64 @@
import javax.naming.*;
/**
- * 2.0 bean.
+ * 2.0 bean.
* @author mvatkina
*/
public abstract class A2Bean implements jakarta.ejb.EntityBean {
-
+
private jakarta.ejb.EntityContext context;
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
*/
public void setEntityContext(jakarta.ejb.EntityContext aContext) {
context=aContext;
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbActivate()
*/
public void ejbActivate() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbPassivate()
*/
public void ejbPassivate() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbRemove()
*/
public void ejbRemove() {
System.out.println("Debug: A2Bean ejbRemove");
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#unsetEntityContext()
*/
public void unsetEntityContext() {
context=null;
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbLoad()
*/
public void ejbLoad() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbStore()
*/
@@ -96,8 +96,8 @@
setName("ABC");
return null;
}
-
- public void ejbPostCreate(java.lang.String name) throws jakarta.ejb.CreateException {
+
+ public void ejbPostCreate(java.lang.String name) throws jakarta.ejb.CreateException {
}
public void setNameWithFlush(java.lang.String s) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java
index 0cbc08f..9b4678d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java
@@ -25,8 +25,8 @@
public interface A2Local extends jakarta.ejb.EJBLocalObject {
- public void setName(String name);
-
- public void setNameWithFlush(String name);
-
+ public void setName(String name);
+
+ public void setNameWithFlush(String name);
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java
index 739003c..d613fa0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java
@@ -24,9 +24,9 @@
*/
public interface A2LocalHome extends jakarta.ejb.EJBLocalHome {
-
+
public A2Local findByPrimaryKey(java.lang.String pk) throws jakarta.ejb.FinderException;
-
+
public A2Local create(java.lang.String name) throws jakarta.ejb.CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java
index e436599..e055b6d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java
@@ -20,13 +20,13 @@
import java.rmi.*;
public interface Test extends EJBObject {
-
+
public void testA1() throws RemoteException;
-
+
public void testA1WithFlush() throws RemoteException;
-
+
public void testA2() throws RemoteException;
-
+
public void testA2WithFlush() throws RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java
index 68162d1..e79f1ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java
@@ -27,21 +27,21 @@
private A2Local a2bean = null;
// SessionBean methods
-
+
public void ejbCreate() throws CreateException {
System.out.println("TestBean ejbCreate");
try {
a1Home = lookupA1();
a2Home = lookupA2();
-
+
} catch (NamingException ex) {
throw new EJBException(ex.getMessage());
}
- }
-
+ }
+
public void ejbActivate() {
System.out.println("TestBean ejbActivate");
- }
+ }
public void ejbPassivate() {
a1Home = null;
@@ -55,13 +55,13 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/A1FL");
return (A1LocalHome) objref;
- }
+ }
private A2LocalHome lookupA2() throws NamingException {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/A2FL");
return (A2LocalHome) objref;
- }
+ }
String msg = "Update succeeded with flush enabled";
@@ -72,7 +72,7 @@
throw new RuntimeException (e.getMessage(), e);
}
-//PG-> a1bean.setName("A12345678901234567890");
+//PG-> a1bean.setName("A12345678901234567890");
}
public void testA2() {
@@ -81,14 +81,14 @@
} catch (CreateException e) {
throw new RuntimeException (e.getMessage());
}
-//PG-> a2bean.setName("A12345678901234567890");
+//PG-> a2bean.setName("A12345678901234567890");
}
public void testA1WithFlush() {
boolean success = true;
try {
a1bean = a1Home.create("B1");
- a1bean.setNameWithFlush("A12345678901234567890");
+ a1bean.setNameWithFlush("A12345678901234567890");
success = false;
} catch (Exception e) {
System.out.println(e.toString());
@@ -102,7 +102,7 @@
boolean success = true;
try {
a2bean = a2Home.create("B2");
- a2bean.setNameWithFlush("A12345678901234567890");
+ a2bean.setNameWithFlush("A12345678901234567890");
success = false;
} catch (Exception e) {
System.out.println(e.toString());
@@ -112,4 +112,4 @@
throw new RuntimeException(msg);
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java
index 4e903cc..ce4e186 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java
@@ -20,6 +20,6 @@
import java.rmi.*;
public interface TestHome extends EJBHome {
-
+
Test create() throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/create_pointbase.sql
index cd88480..4133c3f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/create_pointbase.sql
@@ -1,13 +1,13 @@
-Drop table A1;
-Drop table A2;
-
-CREATE TABLE A1 (
- id char(3) not null constraint pk_A1_id primary key,
- name char(5)
-);
-
-CREATE TABLE A2 (
- id char(3) not null constraint pk_A2_id primary key,
- name char(5)
-);
-
+Drop table A1;
+Drop table A2;
+
+CREATE TABLE A1 (
+ id char(3) not null constraint pk_A1_id primary key,
+ name char(5)
+);
+
+CREATE TABLE A2 (
+ id char(3) not null constraint pk_A2_id primary key,
+ name char(5)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/drop_pointbase.sql
index 81765dc..e069170 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table A1;
-Drop table A2;
+Drop table A1;
+Drop table A2;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/build.xml
index 594b4ad..c686730 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/build.xml
@@ -82,17 +82,17 @@
</target>
<target name="usage">
- <echo> Usage:
- ant customer (Executes the customer tests)
- ant all (Executes all the ejb cmp tests)
- ant clean (cleans all the ejb cmp tests)
- ant build (builds all the ejb cmp tests)
- ant setup (sets up all resources for cmp tests)
- ant deploy (deploys all the ejb cmp apps)
- ant run (Executes all the ejb cmp tests)
- ant undeploy (undeploys all the cmp apps)
- ant unsetup (unsets all resources for cmp tests)
- </echo>
+ <echo> Usage:
+ ant customer (Executes the customer tests)
+ ant all (Executes all the ejb cmp tests)
+ ant clean (cleans all the ejb cmp tests)
+ ant build (builds all the ejb cmp tests)
+ ant setup (sets up all resources for cmp tests)
+ ant deploy (deploys all the ejb cmp apps)
+ ant run (Executes all the ejb cmp tests)
+ ant undeploy (undeploys all the cmp apps)
+ ant unsetup (unsets all resources for cmp tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.properties b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.properties
index 04f01eb..d63a23e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.properties
@@ -15,20 +15,20 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-cmp"/>
-<property name="appname" value="${module}-customer"/>
+<property name="appname" value="${module}-customer"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar-customer.xml" value="descriptor/ejb-jar-customer.xml"/>
<property name="sun-ejb-jar-customer.xml" value="descriptor/sun-ejb-jar-customer.xml"/>
<property name="sun-cmp-mappings.xml" value="descriptor/sun-cmp-mappings.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="dbschema" value="sql/PreselectSchema.dbschema"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.xml
index 71554df..4f71336 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.xml
@@ -35,8 +35,8 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
- <target name="compile" depends="clean">
+
+ <target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
</antcall>
@@ -50,27 +50,27 @@
<antcall target="package-customer-jar"/>
<antcall target="appclient-jar-common"/>
<antcall target="package-ear"/>
- </target>
+ </target>
<target name="package-customer-jar">
<antcall target="package-ejbjar-common">
<param name="ejb-jar.xml" value="${ejb-jar-customer.xml}"/>
<param name="sun-ejb-jar.xml" value="${sun-ejb-jar-customer.xml}"/>
- <param name="ejbjar.files" value="${build.classes.dir}"/>
+ <param name="ejbjar.files" value="${build.classes.dir}"/>
<param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
</antcall>
- </target>
+ </target>
<target name="package-ear">
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib" includes="reporter.jar"/>
- </ear>
+ </ear>
</target>
<target name="sql" depends="init-common">
@@ -91,14 +91,14 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="execute-sql-common">
@@ -107,15 +107,15 @@
<antcall target="delete-persistence-resource-common"/>
<antcall target="undeploy-jdbc-common"/>
<antcall target="reconfig-common"/>
- </target>
-
+ </target>
+
<target name="sql-create" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
</target>
- <target name="sql-drop" depends="init-common">
+ <target name="sql-drop" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/client/PreselectClient.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/client/PreselectClient.java
index 5df501a..c1bb77b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/client/PreselectClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/client/PreselectClient.java
@@ -26,39 +26,39 @@
public class PreselectClient {
-
+
private static SimpleReporterAdapter status =
new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
try {
- System.out.println("Starting preselect....");
- System.out.println("Customer Bob has added 3 items to his shopping cart :");
- System.out.println(" The items are : 1> Dark Chocolate $40, 2> Milk Chocolate $30, 3> White Chocolate $20");
+ System.out.println("Starting preselect....");
+ System.out.println("Customer Bob has added 3 items to his shopping cart :");
+ System.out.println(" The items are : 1> Dark Chocolate $40, 2> Milk Chocolate $30, 3> White Chocolate $20");
status.addDescription("Testing cmp preselect app.");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleCustomer");
- CustomerHome home =
- (CustomerHome)PortableRemoteObject.narrow(objref,
+ CustomerHome home =
+ (CustomerHome)PortableRemoteObject.narrow(objref,
CustomerHome.class);
CustomerRemote myCustomer = home.create("1","Bob");
- System.out.println("Let us select all items that Bob bought whose price is below $100");
- int items = myCustomer.getItemsForLess();
+ System.out.println("Let us select all items that Bob bought whose price is below $100");
+ int items = myCustomer.getItemsForLess();
- if (items == 0) {
- System.out.println("No items available below $100 for this customer. ejbStore() was called before ejbSelect() and it modified the price of each item to $200");
- status.addStatus("cmp preselect:getSomeInfo", status.PASS);
- } else {
- System.out.println("Found " + items + " items with price less than 100. ejbStore was not called before ejbSelect. Hence the price of the items was not modified to $200");
- status.addStatus("cmp preselect:getSomeInfo", status.FAIL);
- }
-
+ if (items == 0) {
+ System.out.println("No items available below $100 for this customer. ejbStore() was called before ejbSelect() and it modified the price of each item to $200");
+ status.addStatus("cmp preselect:getSomeInfo", status.PASS);
+ } else {
+ System.out.println("Found " + items + " items with price less than 100. ejbStore was not called before ejbSelect. Hence the price of the items was not modified to $200");
+ status.addStatus("cmp preselect:getSomeInfo", status.FAIL);
+ }
+
status.printSummary("preselectAppID");
System.exit(0);
} catch (Throwable ex) {
- status.addStatus("cmp preselect:getSomeInfo", status.FAIL);
+ status.addStatus("cmp preselect:getSomeInfo", status.FAIL);
System.err.println("Caught an exception in main: " + ex.toString());
ex.printStackTrace();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml
index bfa035c..1b1a74d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml
@@ -44,7 +44,7 @@
<ejb-ref-type>Entity</ejb-ref-type>
<local-home>com.sun.s1peqe.ejb.cmp.preselect.ejb.ItemLocalHome</local-home>
<local>com.sun.s1peqe.ejb.cmp.preselect.ejb.ItemLocal</local>
- <ejb-link>Item</ejb-link>
+ <ejb-link>Item</ejb-link>
</ejb-local-ref>
<query>
<query-method>
@@ -54,7 +54,7 @@
</method-params>
</query-method>
<ejb-ql>SELECT OBJECT(item) FROM ItemSchema item WHERE item.price < 100
- </ejb-ql>
+ </ejb-ql>
</query>
</entity>
<entity>
@@ -100,8 +100,8 @@
<multiplicity>Many</multiplicity>
<relationship-role-source>
<ejb-name>Item</ejb-name>
- </relationship-role-source>
- </ejb-relationship-role>
+ </relationship-role-source>
+ </ejb-relationship-role>
</ejb-relation>
</relationships>
<assembly-descriptor>
@@ -163,7 +163,7 @@
<method-name>create</method-name>
<method-params>
<method-param>java.lang.String</method-param>
- <method-param>java.lang.String</method-param>
+ <method-param>java.lang.String</method-param>
</method-params>
</method>
<method>
@@ -267,7 +267,7 @@
</container-transaction>
<container-transaction>
<method>
- <ejb-name>Item</ejb-name>
+ <ejb-name>Item</ejb-name>
<method-name>*</method-name>
</method>
<trans-attribute>Required</trans-attribute>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java
index fa37d56..b817c46 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java
@@ -29,10 +29,10 @@
// Access methods for persistent fields
public abstract String getId();
public abstract void setId(String id);
-
+
public abstract String getName();
public abstract void setName(String name);
-
+
// Access methods for relationship fields
public abstract Collection getItems();
public abstract void setItems(Collection items);
@@ -44,39 +44,39 @@
// Business methods
public int getItemsForLess() throws FinderException, RemoteException {
int count = 0;
- CustomerLocal customer =
+ CustomerLocal customer =
(CustomerLocal)context.getEJBLocalObject();
- try {
- InitialContext initial = new InitialContext();
- Object objref = initial.lookup("java:comp/env/ejb/SimpleItem");
- ItemLocalHome itemHome =
- (ItemLocalHome)PortableRemoteObject.narrow(objref,
+ try {
+ InitialContext initial = new InitialContext();
+ Object objref = initial.lookup("java:comp/env/ejb/SimpleItem");
+ ItemLocalHome itemHome =
+ (ItemLocalHome)PortableRemoteObject.narrow(objref,
ItemLocalHome.class);
- ItemLocal item = itemHome.create("Dark Chocolate", "1", 20.00);
- getItems().add(item);
-
- item = itemHome.create("Milk Chocolate", "2", 30.00);
- getItems().add(item);
+ ItemLocal item = itemHome.create("Dark Chocolate", "1", 20.00);
+ getItems().add(item);
- item = itemHome.create("White Chocolate", "3", 40.00);
- getItems().add(item);
+ item = itemHome.create("Milk Chocolate", "2", 30.00);
+ getItems().add(item);
- System.out.println("calling ejbSelectItemsLessThan100...");
- Collection items = ejbSelectItemsLessThan100(customer);
+ item = itemHome.create("White Chocolate", "3", 40.00);
+ getItems().add(item);
- if (items != null) {
-
- for (Iterator iterator = items.iterator(); iterator.hasNext();) {
- System.out.println("Item.price < 100 : " +
- ((ItemLocal)iterator.next()).getId());
- count++;
- }
- }
- return count;
+ System.out.println("calling ejbSelectItemsLessThan100...");
+ Collection items = ejbSelectItemsLessThan100(customer);
- } catch (Exception e) {
- throw new EJBException(e.getMessage());
- }
+ if (items != null) {
+
+ for (Iterator iterator = items.iterator(); iterator.hasNext();) {
+ System.out.println("Item.price < 100 : " +
+ ((ItemLocal)iterator.next()).getId());
+ count++;
+ }
+ }
+ return count;
+
+ } catch (Exception e) {
+ throw new EJBException(e.getMessage());
+ }
}
// EntityBean methods
@@ -85,34 +85,34 @@
System.out.print("CustomerBean ejbCreate");
setId(id);
setName(name);
- return null;
+ return null;
}
-
+
public void ejbPostCreate (String id, String name) throws CreateException { }
public void setEntityContext(EntityContext ctx) {
context = ctx;
}
-
+
public void unsetEntityContext() {
context = null;
}
-
+
public void ejbRemove() {
System.out.print("CustomerBean ejbRemove");
}
-
+
public void ejbLoad() {
System.out.print("CustomerBean ejbLoad");
}
-
+
public void ejbStore() {
System.out.print("CustomerBean ejbStore");
}
-
+
public void ejbPassivate() { }
-
+
public void ejbActivate() { }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java
index f9c6a10..e3ee0a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java
@@ -21,9 +21,9 @@
import java.rmi.RemoteException;
public interface CustomerHome extends EJBHome {
-
+
public CustomerRemote create (String id, String name) throws RemoteException, CreateException;
-
+
public CustomerRemote findByPrimaryKey (String id)
- throws FinderException, RemoteException;
+ throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java
index 5d0c2bb..eb28e91 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java
@@ -20,9 +20,9 @@
import jakarta.ejb.*;
public interface CustomerLocalHome extends EJBLocalHome {
-
+
public CustomerLocal create (String id, String name) throws CreateException;
-
+
public CustomerLocal findByPrimaryKey (String id)
throws FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java
index 38e2294..8972711 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java
@@ -27,13 +27,13 @@
// Access methods for persistent fields
public abstract String getId();
public abstract void setId(String id);
-
+
public abstract String getName();
public abstract void setName(String name);
public abstract double getPrice();
public abstract void setPrice(double price);
-
+
// Business methods
public void modifyPrice(double newPrice) {
@@ -47,39 +47,39 @@
System.out.print("ItemBean ejbCreate");
setId(id);
setName(name);
- setPrice(price);
- return null;
+ setPrice(price);
+ return null;
}
-
+
public void ejbPostCreate (String id, String name, double price) throws CreateException { }
public void setEntityContext(EntityContext ctx) {
context = ctx;
}
-
+
public void unsetEntityContext() {
context = null;
}
-
+
public void ejbRemove() {
System.out.print("ItemBean ejbRemove");
}
-
+
public void ejbLoad() {
System.out.print("ItemBean ejbLoad");
}
-
+
public void ejbStore() {
System.out.print("ItemBean ejbStore");
- ItemLocal item = (ItemLocal)context.getEJBLocalObject();
-
- System.out.println("Item price less than $100 : " +
- item.getId());
- System.out.println("Modifying its price to $200...");
- item.modifyPrice(200.00);
+ ItemLocal item = (ItemLocal)context.getEJBLocalObject();
+
+ System.out.println("Item price less than $100 : " +
+ item.getId());
+ System.out.println("Modifying its price to $200...");
+ item.modifyPrice(200.00);
}
-
+
public void ejbPassivate() { }
-
+
public void ejbActivate() { }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java
index 1061db6..4619976 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java
@@ -21,9 +21,9 @@
import java.rmi.RemoteException;
public interface ItemHome extends EJBHome {
-
+
public ItemRemote create (String id, String name, double price) throws CreateException, RemoteException;
-
+
public ItemRemote findByPrimaryKey (String id)
- throws FinderException, RemoteException;
+ throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java
index beecd09..792102a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java
@@ -22,5 +22,5 @@
public interface ItemLocal extends EJBLocalObject, java.io.Serializable {
public String getId();
public double getPrice();
- public void modifyPrice(double newPrice);
+ public void modifyPrice(double newPrice);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java
index 06c57cd..193a859 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java
@@ -21,9 +21,9 @@
public interface ItemLocalHome extends EJBLocalHome {
-
+
public ItemLocal create (String id, String name, double price) throws CreateException;
-
+
public ItemLocal findByPrimaryKey (String id)
throws FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java
index 4656e05..26f2d2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java
@@ -21,5 +21,5 @@
import java.rmi.RemoteException;
public interface ItemRemote extends EJBObject {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/sql/create_pointbase.sql
index 62e615a..5bc079b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/sql/create_pointbase.sql
@@ -1,20 +1,20 @@
DROP TABLE Customer;
DROP TABLE Item;
-CREATE TABLE Customer
+CREATE TABLE Customer
(
- CUSTOMER_ID VARCHAR(255) PRIMARY KEY,
- name VARCHAR(255)
+ CUSTOMER_ID VARCHAR(255) PRIMARY KEY,
+ name VARCHAR(255)
);
-CREATE TABLE Item
+CREATE TABLE Item
(
- item_Id VARCHAR(255) PRIMARY KEY,
- name VARCHAR(255) ,
- price DOUBLE PRECISION NOT NULL ,
- CUSTOMER_ID VARCHAR(255) ,
- FOREIGN KEY (CUSTOMER_ID) REFERENCES Customer (CUSTOMER_ID)
+ item_Id VARCHAR(255) PRIMARY KEY,
+ name VARCHAR(255) ,
+ price DOUBLE PRECISION NOT NULL ,
+ CUSTOMER_ID VARCHAR(255) ,
+ FOREIGN KEY (CUSTOMER_ID) REFERENCES Customer (CUSTOMER_ID)
);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.properties b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.properties
index 87c889b..995ca72 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.properties
@@ -15,20 +15,20 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-cmp-readonly"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="sun-cmp-mappings.xml" value="descriptor/sun-cmp-mappings.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="dbschema" value="sql/readonly.dbschema"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.xml
index f08d0a0..48f7052 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,25 +48,25 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*.dbschema" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Student.class,**/*Home*.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
</target>
- <target name="deploy" depends="init-common">
+ <target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
- <antcall target="runclient-common">
+ <antcall target="runclient-common">
</antcall>
</target>
@@ -75,10 +75,10 @@
<param name="appclient.application.args" value="100 10 1 100"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="execute-ejb-sql-common">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java
index 0547214..4b1c24f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java
@@ -28,7 +28,7 @@
import java.rmi.RemoteException;
/**
- * A simple java client will:
+ * A simple java client will:
* <ul>
* <li>Locates the home interface of the enterprise bean
* <li>Gets a reference to the remote interface
@@ -45,9 +45,9 @@
private int numPKs_ = 1;
private long sleepTimeInMillis_ = 100;
- public static void main(String[] args) {
+ public static void main(String[] args) {
- ReadOnlyClient client = new ReadOnlyClient();
+ ReadOnlyClient client = new ReadOnlyClient();
if( args.length == 4 ) {
@@ -56,22 +56,22 @@
int numPKs = Integer.parseInt(args[2]);
long sleepTimeInMillis = Long.parseLong(args[3]);
client.runThreadTest(numIterations, numThreads, numPKs,
- sleepTimeInMillis);
+ sleepTimeInMillis);
} else {
- client.runTestClient();
+ client.runTestClient();
}
// run the tests
-
+
}
- public void runTestClient() {
+ public void runTestClient() {
try{
stat.addDescription("Testing Cmp CMPReadOnlyClient app.");
test11();
- test01();
+ test01();
test05();
test12();
@@ -83,7 +83,7 @@
}
public void runThreadTest(int numIterations, int numThreads, int numPKs,
- long sleepTimeInMillis) {
+ long sleepTimeInMillis) {
numIterations_ = numIterations;
numThreads_ = numThreads;
@@ -91,7 +91,7 @@
sleepTimeInMillis_ = sleepTimeInMillis;
try{
- stat.addDescription("Cmp CMPReadOnlyClient thread test");
+ stat.addDescription("Cmp CMPReadOnlyClient thread test");
test12();
stat.printSummary("CMPReadOnlyClient");
} catch (Exception ex) {
@@ -104,8 +104,8 @@
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
try {
@@ -118,7 +118,7 @@
stat.addStatus("CMPReadOnlyClient Student ", stat.FAIL);
System.err.println("Caught an exception!");
ex.printStackTrace();
- //Expected
+ //Expected
}
} catch (Throwable th) {
System.err.println("Caught an unexpected exception!");
@@ -131,8 +131,8 @@
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
try {
@@ -145,7 +145,7 @@
stat.addStatus("CMPReadOnlyClient Student ", stat.FAIL);
System.err.println("Caught an exception!");
ex.printStackTrace();
- //Expected
+ //Expected
}
} catch (Throwable th) {
System.err.println("Caught an unexpected exception!");
@@ -176,20 +176,20 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome readOnlyStudentHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome readOnlyStudentHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
objref = initial.lookup("java:comp/env/ejb/MutableStudent");
- StudentHome mutableStudentHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome mutableStudentHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
Student newStudent = mutableStudentHome.create("999", "Joe Schmo");
Student newStudent2 = mutableStudentHome.create("998", "Jill Schmo");
readOnlyStudentHome.testFind("999");
readOnlyStudentHome.testFind("998");
-
+
readOnlyStudentHome.testLocalFind("999");
readOnlyStudentHome.testLocalFind("998");
@@ -198,9 +198,9 @@
readOnlyStudentHome.findBar("999");
readOnlyStudentHome.findBar("998");
- Student readOnlyStudent =
+ Student readOnlyStudent =
readOnlyStudentHome.findByPrimaryKey("999");
- Student readOnlyStudent2 =
+ Student readOnlyStudent2 =
readOnlyStudentHome.findByPrimaryKey("998");
readOnlyStudentHome.findByRemoteStudent(readOnlyStudent);
@@ -262,9 +262,9 @@
// to create a new instance of the bean and call ejbLoad on it.
// So, only use name1 and name2 to decide if test passed.
if (name1.equals(readOnlyName1) && name2.equals(readOnlyName2) &&
- name1.equals(readOnlyName1Tx) &&
+ name1.equals(readOnlyName1Tx) &&
name2.equals(readOnlyName2Tx)) {
-
+
stat.addStatus("CMPReadOnlyClient ReadMostly ", stat.PASS);
} else {
stat.addStatus("CMPReadOnlyClient ReadMostly ", stat.FAIL);
@@ -276,7 +276,7 @@
stat.addStatus("CMPReadOnlyClient ReadMostly ", stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
- }
+ }
}
private void test12() {
@@ -285,7 +285,7 @@
System.out.println("Num Iterations = " + numIterations_);
System.out.println("Num Threads = " + numThreads_);
System.out.println("Num PKs = " + numPKs_);
- System.out.println("Sleep time in milliseconds = " +
+ System.out.println("Sleep time in milliseconds = " +
sleepTimeInMillis_);
int numWriterIterations = numIterations_ / 100;
@@ -293,30 +293,30 @@
System.out.println("Num writer iterations = " +
numWriterIterations);
- System.out.println("Writer sleep time in milliseconds = " +
+ System.out.println("Writer sleep time in milliseconds = " +
writerSleepTimeInMillis);
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome readOnlyStudentHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome readOnlyStudentHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
objref = initial.lookup("java:comp/env/ejb/MutableStudent");
- StudentHome mutableStudentHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome mutableStudentHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
-
+
Student[] newStudents = new Student[numPKs_];
Student[] readOnlyStudents = new Student[numPKs_];
Thread[] readers = new Thread[numThreads_ * numPKs_];
Thread[] writers = new Thread[numPKs_];
for(int i = 0; i < numPKs_; i++) {
- newStudents[i] =
+ newStudents[i] =
mutableStudentHome.create("ReaderThread" + i, "ABC" + i);
- System.out.println("Creating student " +
+ System.out.println("Creating student " +
newStudents[i].getPrimaryKey());
}
@@ -324,9 +324,9 @@
readOnlyStudentHome.findFoo();
for(int i = 0; i < numPKs_; i++) {
- readOnlyStudents[i] =
+ readOnlyStudents[i] =
readOnlyStudentHome.findByPrimaryKey("ReaderThread" + i);
- writers[i] = new WriterThread(newStudents[i],
+ writers[i] = new WriterThread(newStudents[i],
numWriterIterations,
writerSleepTimeInMillis);
for(int j = 0; j < numThreads_; j++) {
@@ -334,21 +334,21 @@
int threadIndex = i*numThreads_ + j;
System.out.println("Thread index = " + threadIndex);
readers[threadIndex] = new ReaderThread
- (readOnlyStudents[i], numIterations_,
+ (readOnlyStudents[i], numIterations_,
sleepTimeInMillis_);
}
}
-
+
for(int i = 0; i < readers.length; i++) {
System.out.println("Starting reader thread " + i);
readers[i].start();
- }
-
+ }
+
for(int i = 0; i < writers.length; i++) {
System.out.println("Starting writer thread " + i);
writers[i].start();
- }
-
+ }
+
System.out.println("Joining on " + readers.length + " readers");
for(int i = 0; i < readers.length; i++) {
readers[i].join();
@@ -357,8 +357,8 @@
for(int i = 0; i < writers.length; i++) {
writers[i].join();
}
-
-
+
+
stat.addStatus("CMPReadOnlyClient ReaderThreads ", stat.PASS);
System.out.println("Removing all students");
@@ -370,24 +370,24 @@
stat.addStatus("CMPReadOnlyClient ReaderThreads ", stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
- }
+ }
}
private class ReaderThread extends Thread {
- Student readOnlyStudent_;
+ Student readOnlyStudent_;
int numReads_;
long sleepTimeInMillis_;
- String studentPK_;
+ String studentPK_;
- ReaderThread(Student readOnlyStudent, int numReads,
+ ReaderThread(Student readOnlyStudent, int numReads,
long sleepTimeInMillis) {
- readOnlyStudent_ = readOnlyStudent;
+ readOnlyStudent_ = readOnlyStudent;
numReads_ = numReads;
sleepTimeInMillis_ = sleepTimeInMillis;
}
- public void run() {
+ public void run() {
for( int i = 0; i < numReads_; i++) {
try {
if( i == 0 ) {
@@ -407,20 +407,20 @@
private class WriterThread extends Thread {
- Student mutableStudent_;
+ Student mutableStudent_;
int numWrites_;
long sleepTimeInMillis_;
String studentPK_;
- WriterThread(Student mutableStudent, int numWrites,
+ WriterThread(Student mutableStudent, int numWrites,
long sleepTimeInMillis) {
- mutableStudent_ = mutableStudent;
+ mutableStudent_ = mutableStudent;
numWrites_ = numWrites;
sleepTimeInMillis_ = sleepTimeInMillis;
}
- public void run() {
- for( int i = 0; i < numWrites_; i++) {
+ public void run() {
+ for( int i = 0; i < numWrites_; i++) {
try {
if( i == 0 ) {
studentPK_ = (String) mutableStudent_.getPrimaryKey();
@@ -439,4 +439,4 @@
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/ejb-jar.xml
index 9793618..b4a8d45 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/ejb-jar.xml
@@ -45,7 +45,7 @@
<security-identity>
<description></description>
<use-caller-identity></use-caller-identity>
- </security-identity>
+ </security-identity>
<query>
<description></description>
<query-method>
@@ -104,7 +104,7 @@
<cmp-field>
<description>no description</description>
<field-name>name</field-name>
- </cmp-field>
+ </cmp-field>
<primkey-field>studentId</primkey-field>
<ejb-ref>
<ejb-ref-name>ejb/ReadOnlyStudent</ejb-ref-name>
@@ -115,7 +115,7 @@
<security-identity>
<description></description>
<use-caller-identity></use-caller-identity>
- </security-identity>
+ </security-identity>
<query>
<description></description>
<query-method>
@@ -161,14 +161,14 @@
<unchecked />
<method>
<ejb-name>ReadOnlyStudentBean</ejb-name>
- <method-name>*</method-name>
+ <method-name>*</method-name>
</method>
<method>
<ejb-name>StudentBean</ejb-name>
<method-name>*</method-name>
</method>
</method-permission>
-
+
<!-- Student EJB -->
<container-transaction>
<method>
@@ -181,7 +181,7 @@
</method-params>
</method>
<trans-attribute>Required</trans-attribute>
- </container-transaction>
+ </container-transaction>
<container-transaction>
<method>
<ejb-name>ReadOnlyStudentBean</ejb-name>
@@ -199,7 +199,7 @@
<method-params />
</method>
<trans-attribute>Required</trans-attribute>
- </container-transaction>
+ </container-transaction>
<container-transaction>
<method>
<ejb-name>ReadOnlyStudentBean</ejb-name>
@@ -210,7 +210,7 @@
</method-params>
</method>
<trans-attribute>Required</trans-attribute>
- </container-transaction>
+ </container-transaction>
<container-transaction>
<method>
<ejb-name>StudentBean</ejb-name>
@@ -229,8 +229,8 @@
<method-name>*</method-name>
</method>
<trans-attribute>Required</trans-attribute>
- </container-transaction>
+ </container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-application-client.xml
index efb6c3e..07bd566 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-application-client.xml
@@ -18,7 +18,7 @@
-->
-<sun-application-client>
+<sun-application-client>
<ejb-ref>
<ejb-ref-name>ejb/SimpleStudent</ejb-ref-name>
<jndi-name>ejb/ejb_cmp_readonly_ReadOnlyStudent</jndi-name>
@@ -26,5 +26,5 @@
<ejb-ref>
<ejb-ref-name>ejb/MutableStudent</ejb-ref-name>
<jndi-name>ejb/ejb_cmp_readonly_Student</jndi-name>
- </ejb-ref>
+ </ejb-ref>
</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-ejb-jar.xml
index d78966f..cb69a7d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-ejb-jar.xml
@@ -21,10 +21,10 @@
<sun-ejb-jar>
<enterprise-beans>
- <name>ejb-cmp-readonly-ejb.jar</name>
+ <name>ejb-cmp-readonly-ejb.jar</name>
<ejb>
<ejb-name>ReadOnlyStudentBean</ejb-name>
- <jndi-name>ejb/ejb_cmp_readonly_ReadOnlyStudent</jndi-name>
+ <jndi-name>ejb/ejb_cmp_readonly_ReadOnlyStudent</jndi-name>
<is-read-only-bean>true</is-read-only-bean>
<refresh-period-in-seconds>60</refresh-period-in-seconds>
</ejb>
@@ -34,7 +34,7 @@
<ejb-ref>
<ejb-ref-name>ejb/ReadOnlyStudent</ejb-ref-name>
<jndi-name>ejb/ejb_cmp_readonly_ReadOnlyStudent</jndi-name>
- </ejb-ref>
+ </ejb-ref>
</ejb>
<cmp-resource>
<jndi-name>jdbc/__default</jndi-name>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java
index 88f7fe6..9f2c79a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java
@@ -53,10 +53,10 @@
try {
System.out.println("Notifying read-only bean of update to " +
"read-mostly Student " + name);
- ReadOnlyBeanNotifier studentNotifier =
+ ReadOnlyBeanNotifier studentNotifier =
ReadOnlyBeanHelper.getReadOnlyBeanNotifier
("java:comp/env/ejb/ReadOnlyStudent");
-
+
// Update read-only version
studentNotifier.refresh(getStudentId());
} catch(Exception e) {
@@ -121,12 +121,12 @@
System.out.println("2nd query of " + pk + " took " +
(after2 - after) + " nano secs");
-
+
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
-
+
}
public void ejbHomeTestLocalFind(String pk) {
@@ -149,17 +149,17 @@
System.out.println("2nd query of " + pk + " took " +
(after2 - after) + " nano secs");
-
+
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
-
+
}
public void ejbHomeTestLocalRemove(String pk) {
-
-
+
+
StudentLocalHome localHome = (StudentLocalHome)
context.getEJBLocalHome();
@@ -180,7 +180,7 @@
System.out.println("Successfully caught exception while trying " +
" to do a remove on a read-only cmp Home");
}
-
+
boolean removeSucceeded = false;
try {
StudentLocal student = localHome.findByPrimaryKey(pk);
@@ -202,34 +202,34 @@
" to do a remove on a read-only cmp ");
}
-
+
}
-
+
public void ejbRemove() {
System.out.println("StudentBean.ejbRemove called");
}
public void setEntityContext(EntityContext context) {
- this.context = context;
+ this.context = context;
}
- public void unsetEntityContext() {
+ public void unsetEntityContext() {
this.context = null;
}
- public void ejbActivate() {
+ public void ejbActivate() {
}
- public void ejbPassivate() {
+ public void ejbPassivate() {
}
- public void ejbLoad() {
+ public void ejbLoad() {
}
- public void ejbStore() {
+ public void ejbStore() {
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java
index 29b022d..9f8ec27 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java
@@ -36,8 +36,8 @@
* @exception throws FinderException and RemoteException.
*
*/
-
- public Student findByPrimaryKey(String studentId)
+
+ public Student findByPrimaryKey(String studentId)
throws FinderException, RemoteException;
public java.util.Collection findFoo() throws FinderException, RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java
index 555eed5..574ff9d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java
@@ -20,7 +20,7 @@
import jakarta.ejb.EJBLocalObject;
public interface StudentLocal extends EJBLocalObject {
-
+
/**
* Returns the Name of a student.
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java
index 59b6166..22c4067 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java
@@ -36,11 +36,11 @@
* @exception throws FinderException.
*
*/
-
- public StudentLocal findByPrimaryKey(String studentId)
+
+ public StudentLocal findByPrimaryKey(String studentId)
throws FinderException;
public StudentLocal findByLocalStudent(StudentLocal student) throws FinderException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/sql/create_pointbase.sql
index 9365e01..6d0e7f7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/sql/create_pointbase.sql
@@ -1,5 +1,5 @@
CREATE TABLE STUDENT (
-STUDENTID VARCHAR(256) NOT NULL PRIMARY KEY,
-NAME VARCHAR(256)
+STUDENTID VARCHAR(256) NOT NULL PRIMARY KEY,
+NAME VARCHAR(256)
)
;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/build.xml
index 3d86d06..fec2950 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/build.xml
@@ -47,11 +47,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ee tests)
- ant methodcheckpoint (Executes the ejb-ee-methodcheckpoint test)
- ant txcheckpoint (Executes the ejb-ee-txcheckpoint test)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ee tests)
+ ant methodcheckpoint (Executes the ejb-ee-methodcheckpoint test)
+ ant txcheckpoint (Executes the ejb-ee-txcheckpoint test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/build.xml
index 331c6de..94d4211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml
index 6dab359..8a63173 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index a0b649a..b036a28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -75,13 +75,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -109,13 +109,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -126,9 +126,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -141,7 +141,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/main/java/com/acme/HttpClient.java
index 7f3cbe5..c98e320 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/main/java/com/acme/HttpClient.java
@@ -72,10 +72,10 @@
System.out.println("Connecting for the " + i + " time....");
u = new URL(url);
uc = u.openConnection();
- for (String cookie : responseCookies) {
- uc.setRequestProperty("Cookie", cookie);
+ for (String cookie : responseCookies) {
+ uc.setRequestProperty("Cookie", cookie);
System.out.println("==>Setting Cookie: " + cookie);
- }
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(2+i);
@@ -105,10 +105,10 @@
System.out.println("Connecting for the " + i + " time....");
u = new URL(url);
uc = u.openConnection();
- for (String cookie : responseCookies) {
- uc.setRequestProperty("Cookie", cookie);
+ for (String cookie : responseCookies) {
+ uc.setRequestProperty("Cookie", cookie);
System.out.println("==>Setting Cookie: " + cookie);
- }
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(5+i);
@@ -121,7 +121,7 @@
System.out.println("Failed " + info);
}
}
-
+
/*
System.out.println("Restarting inst1...");
proc = Runtime.getRuntime().exec(ASADMIN + " start-instance inst1");
@@ -146,14 +146,14 @@
responseCookies.add(cookie);
System.out.println("JUST READ COOKIE: " + cookie);
if (cookie.startsWith("JSESSIONID=")) {
- jsessionIDCookie = cookie;
+ jsessionIDCookie = cookie;
}
}
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(jsessionIDCookie);
- responseCookies.add(jsessionIDCookie);
+ tmpSessState.setJsessionCookie(jsessionIDCookie);
+ responseCookies.add(jsessionIDCookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -220,7 +220,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/build.xml
index 331c6de..94d4211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
index 6dab359..8a63173 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index 6e663ce..3643389 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -32,8 +32,8 @@
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -47,7 +47,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -63,13 +63,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -80,9 +80,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -95,7 +95,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.properties
index 7a8f104..3271c26 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-ha-web"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.xml
index 53c7612..38a57c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,16 +42,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
@@ -72,11 +72,11 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="removeResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java
index 65a1430..5e36340 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java
@@ -116,7 +116,7 @@
System.out.println("Failed " + info);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -134,7 +134,7 @@
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(cookie);
+ tmpSessState.setJsessionCookie(cookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -169,7 +169,7 @@
result = result && prev.getJsessionCookie().equals(current.getJsessionCookie());
result = result && prev.getHttpCounter() < current.getHttpCounter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/build.xml
index 331c6de..94d4211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml
index 6dab359..8a63173 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index a0b649a..b036a28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -75,13 +75,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -109,13 +109,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -126,9 +126,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -141,7 +141,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/main/java/com/acme/HttpClient.java
index e9d391b..f4876f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/main/java/com/acme/HttpClient.java
@@ -117,7 +117,7 @@
System.out.println("Failed " + info);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -135,7 +135,7 @@
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(cookie);
+ tmpSessState.setJsessionCookie(cookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -202,7 +202,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/build.xml
index 2abf55d..0245098 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml
index 9d67812..e752213 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index c408fdd..c11bafa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -76,13 +76,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBMethodCheckpointDriver/SimpleSessionBean");
sfsb2 = (CheckpointedBean) ctx.lookup("java:global/SFSBMethodCheckpointDriver/CheckpointedBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -113,13 +113,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -130,9 +130,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -145,7 +145,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/main/java/com/acme/HttpClient.java
index 01502bd..f840194 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/main/java/com/acme/HttpClient.java
@@ -72,9 +72,9 @@
System.out.println("Connecting for the " + i + " time....");
u = new URL(url);
uc = u.openConnection();
- for (String cookie : responseCookies) {
- uc.setRequestProperty("Cookie", cookie);
- }
+ for (String cookie : responseCookies) {
+ uc.setRequestProperty("Cookie", cookie);
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(2+i);
@@ -105,9 +105,9 @@
System.out.println("Connecting for the " + i + " time....");
u = new URL(url);
uc = u.openConnection();
- for (String cookie : responseCookies) {
- uc.setRequestProperty("Cookie", cookie);
- }
+ for (String cookie : responseCookies) {
+ uc.setRequestProperty("Cookie", cookie);
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(5+i);
@@ -120,7 +120,7 @@
System.out.println("Failed " + info);
}
}
-
+
/*
System.out.println("Restarting inst1...");
proc = Runtime.getRuntime().exec(ASADMIN + " start-instance inst1");
@@ -144,14 +144,14 @@
responseCookies.add(cookie);
System.out.println("JUST READ COOKIE: " + cookie);
if (cookie.startsWith("JSESSIONID=")) {
- jsessionIDCookie = cookie;
+ jsessionIDCookie = cookie;
}
}
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(jsessionIDCookie);
- responseCookies.add(jsessionIDCookie);
+ tmpSessState.setJsessionCookie(jsessionIDCookie);
+ responseCookies.add(jsessionIDCookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -172,21 +172,21 @@
if (! "null".equals(val.trim())) {
tmpSessState.setHttpCounter(Integer.valueOf(val.trim()));
}
- } else if (tokens[0].startsWith("<h1>From")) {
+ } else if (tokens[0].startsWith("<h1>From")) {
if (tokens[2].startsWith("SFSB[1]")) {
- Boolean retrieved = Boolean.valueOf(tokens[tokens.length - 2]);
- tmpSessState.setEjb1StateNew(! retrieved);
+ Boolean retrieved = Boolean.valueOf(tokens[tokens.length - 2]);
+ tmpSessState.setEjb1StateNew(! retrieved);
} else if (tokens[2].startsWith("SFSB[2]")) {
- Boolean retrieved = Boolean.valueOf(tokens[tokens.length - 2]);
- tmpSessState.setEjb2StateNew(! retrieved);
+ Boolean retrieved = Boolean.valueOf(tokens[tokens.length - 2]);
+ tmpSessState.setEjb2StateNew(! retrieved);
}
} else if (tokens[0].startsWith("<h1>Retrieved")) {
if (tokens[1].startsWith("SFSB[1]")) {
- int state1 = Integer.valueOf(tokens[tokens.length - 2]);
- tmpSessState.setEjb1Counter(state1);
+ int state1 = Integer.valueOf(tokens[tokens.length - 2]);
+ tmpSessState.setEjb1Counter(state1);
} else if (tokens[2].startsWith("SFSB[2]")) {
- int state2 = Integer.valueOf(tokens[tokens.length - 2]);
- tmpSessState.setEjb2Counter(state2);
+ int state2 = Integer.valueOf(tokens[tokens.length - 2]);
+ tmpSessState.setEjb2Counter(state2);
}
}
}
@@ -213,11 +213,11 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
- if (isFirstAccessAfterFailover) {
+ if (isFirstAccessAfterFailover) {
result = result && current.getEjb2Counter() == 3;
- } else {
+ } else {
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
- }
+ }
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/build.xml
index 331c6de..94d4211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml
index 6dab359..8a63173 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index a0b649a..b036a28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -75,13 +75,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -109,13 +109,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -126,9 +126,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -141,7 +141,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/main/java/com/acme/HttpClient.java
index fb02577..c86be6c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/main/java/com/acme/HttpClient.java
@@ -46,96 +46,96 @@
public HttpClient(String[] args) {
host = "localhost";
- canProceed = (args.length == 6);
- if (canProceed) {
+ canProceed = (args.length == 6);
+ if (canProceed) {
for (int i=0; i<3; i++) {
- instanceNames[i] = args[2 * i];
- port[i] = args[2 * i + 1];
+ instanceNames[i] = args[2 * i];
+ port[i] = args[2 * i + 1];
}
- }
+ }
}
public void doTest() {
- if (! canProceed) {
- System.err.println("Usage: java -cp <cp> com.acme.HttpClient <inst_0_name> <port0> <inst_1_name> <port1> <inst_2_name> <port2> ");
+ if (! canProceed) {
+ System.err.println("Usage: java -cp <cp> com.acme.HttpClient <inst_0_name> <port0> <inst_1_name> <port1> <inst_2_name> <port2> ");
} else {
try {
String url = "http://" + host + ":" + port[0] +
"/" + appName + "/" + servletName;
-
+
System.out.println("invoking webclient servlet at " + url);
-
+
URL u = new URL(url);
URLConnection uc = u.openConnection();
-
+
stateInfo = extractSessionStates(uc);
stateInfo.setAccessCount(1);
jsessionIDCookie = stateInfo.getJsessionCookie();
-
+
stopAndAccessAndStart(instanceNames[0], port[1]);
stopAndAccessAndStart(instanceNames[1], port[2]);
stopAndAccessAndStart(instanceNames[2], port[0]);
-
+
} catch (Exception e) {
e.printStackTrace();
}
- }
+ }
}
private void stopAndAccessAndStart(String instance, String port) {
try { Thread.sleep(3*1000); } catch (Exception ex) {}
- stopInstance(instance);
+ stopInstance(instance);
String url = "http://" + host + ":" + port +
"/" + appName + "/" + servletName;
System.out.println("** ACCESSING URL : " + url);
for (int i = 0; i < 3; i++) {
if (! accessApplication(url)) {
- break;
- }
+ break;
+ }
}
- startInstance(instance);
+ startInstance(instance);
url = "http://" + host + ":" + port +
"/" + appName + "/" + servletName;
for (int i = 0; i < 3; i++) {
if (! accessApplication(url)) {
- break;
- }
+ break;
+ }
}
}
private void stopInstance(String instName) {
- try {
- System.out.println("Executing stop-instance " + instName);
- Thread.sleep(3 * 1000);
- Process proc = Runtime.getRuntime().exec(ASADMIN + " stop-instance " + instName);
- proc.waitFor();
- System.out.println("Process stop-instance " + instName + " finished...");
- } catch (Exception ex) {
- System.err.println("Error while stopping instance " + instName);
- }
+ try {
+ System.out.println("Executing stop-instance " + instName);
+ Thread.sleep(3 * 1000);
+ Process proc = Runtime.getRuntime().exec(ASADMIN + " stop-instance " + instName);
+ proc.waitFor();
+ System.out.println("Process stop-instance " + instName + " finished...");
+ } catch (Exception ex) {
+ System.err.println("Error while stopping instance " + instName);
+ }
}
private void startInstance(String instName) {
- try {
- System.out.println("Executing start-instance " + instName);
- Process proc = Runtime.getRuntime().exec(ASADMIN + " start-instance " + instName);
- proc.waitFor();
- System.out.println("Process start-instance " + instName + " finished...");
- Thread.sleep(3 * 1000);
- } catch (Exception ex) {
- System.err.println("Error while starting instance " + instName);
- }
+ try {
+ System.out.println("Executing start-instance " + instName);
+ Process proc = Runtime.getRuntime().exec(ASADMIN + " start-instance " + instName);
+ proc.waitFor();
+ System.out.println("Process start-instance " + instName + " finished...");
+ Thread.sleep(3 * 1000);
+ } catch (Exception ex) {
+ System.err.println("Error while starting instance " + instName);
+ }
}
private boolean accessApplication(String urlStr) {
- try {
+ try {
URL url = new URL(urlStr);
URLConnection uc = url.openConnection();
- for (String cookie : responseCookies) {
+ for (String cookie : responseCookies) {
uc.setRequestProperty("Cookie", cookie);
- }
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(++_accessCount);
@@ -145,7 +145,7 @@
System.out.println("Passed " + stateInfo);
} else {
System.out.println("Failed " + info);
- return false;
+ return false;
}
} catch (Exception e) {
e.printStackTrace();
@@ -166,14 +166,14 @@
responseCookies.add(cookie);
System.out.println("JUST READ COOKIE: " + cookie);
if (cookie.startsWith("JSESSIONID=")) {
- jsessionIDCookie = cookie;
+ jsessionIDCookie = cookie;
}
}
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(jsessionIDCookie);
- responseCookies.add(jsessionIDCookie);
+ tmpSessState.setJsessionCookie(jsessionIDCookie);
+ responseCookies.add(jsessionIDCookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
@@ -240,7 +240,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/build.xml
index 331c6de..94d4211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
index 04e2bd8..63ce435 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -863,7 +863,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -902,7 +902,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -929,7 +929,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -955,7 +955,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index e47657b..6170966 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -76,13 +76,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -110,13 +110,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -127,9 +127,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -142,7 +142,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/build.xml
index 570c712..d5e2bfa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml
index 18c57d8..ccbe604 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -863,7 +863,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -902,7 +902,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -929,7 +929,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -955,7 +955,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSFSBDriverServlet.java
index 4a529a4..5334c13 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SimpleSFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -76,13 +76,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SimpleSFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleShoppingCartBean) ctx.lookup("java:global/SimpleSFSBDriver/SimpleShoppingCartBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -110,13 +110,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -127,9 +127,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -142,7 +142,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java
index bb21a6f..1df3d3f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java
@@ -72,10 +72,10 @@
System.out.println("Connecting for the " + i + " time....");
u = new URL(url);
uc = u.openConnection();
- for (String cookie : responseCookies) {
- uc.setRequestProperty("Cookie", cookie);
+ for (String cookie : responseCookies) {
+ uc.setRequestProperty("Cookie", cookie);
System.out.println("==>Setting Cookie: " + cookie);
- }
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(2+i);
@@ -105,10 +105,10 @@
System.out.println("Connecting for the " + i + " time....");
u = new URL(url);
uc = u.openConnection();
- for (String cookie : responseCookies) {
- uc.setRequestProperty("Cookie", cookie);
+ for (String cookie : responseCookies) {
+ uc.setRequestProperty("Cookie", cookie);
System.out.println("==>Setting Cookie: " + cookie);
- }
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(5+i);
@@ -121,7 +121,7 @@
System.out.println("Failed " + info);
}
}
-
+
/*
System.out.println("Restarting inst1...");
proc = Runtime.getRuntime().exec(ASADMIN + " start-instance inst1");
@@ -146,14 +146,14 @@
responseCookies.add(cookie);
System.out.println("JUST READ COOKIE: " + cookie);
if (cookie.startsWith("JSESSIONID=")) {
- jsessionIDCookie = cookie;
+ jsessionIDCookie = cookie;
}
}
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(jsessionIDCookie);
- responseCookies.add(jsessionIDCookie);
+ tmpSessState.setJsessionCookie(jsessionIDCookie);
+ responseCookies.add(jsessionIDCookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -220,7 +220,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/build.xml
index 5e3f315..e6448da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/build.xml
@@ -47,9 +47,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ee tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ee tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.properties
index 758dfb8..f18ae80 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-methodcheckpoint-multi"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.xml
index 4c56fa0..2cc10ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
index bd1e4ef..1e4b11f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
@@ -28,7 +28,7 @@
private static final int INCREMENT_VAL = 60000;
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private SFSBHome home;
@@ -44,20 +44,20 @@
client.doTest();
System.out.println("[multiClient] DONE doTest()...");
stat.printSummary("multi");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- createSFSB(); //create SFSBs
+ createSFSB(); //create SFSBs
initialStateTest(); //access the SFBS
- nonTxNonCheckpointTest();
- nonTxCheckpointTest();
+ nonTxNonCheckpointTest();
+ nonTxCheckpointTest();
}
private void createSFSB() {
- String testCaseName = "ee.multiClient createSFSB ";
+ String testCaseName = "ee.multiClient createSFSB ";
try {
Context ic = new InitialContext();
Object objref = ic.lookup("java:comp/env/ejb/SFSBHome");
@@ -65,92 +65,92 @@
(objref, SFSBHome.class);
sfsb = (SFSB) home.create(accountName, 4000);
System.out.println("[multi] Initalization done");
- stat.addStatus(testCaseName, stat.PASS);
+ stat.addStatus(testCaseName, stat.PASS);
} catch(Exception e) {
e.printStackTrace();
//stat.addStatus("ejbclient localEntityGetEJBObject(-)" , stat.PASS);
System.out.println("[multiClient] Exception in init....");
e.printStackTrace();
- stat.addStatus(testCaseName, stat.FAIL);
+ stat.addStatus(testCaseName, stat.FAIL);
}
}
public void initialStateTest() {
- String testCaseName = "ee.multiClient initialStateTest ";
+ String testCaseName = "ee.multiClient initialStateTest ";
try {
- boolean nameOK = true;
- nameOK = accountName.equals(sfsb.getAccountHolderName());
- int preBalance = sfsb.getBalance();
- int preCheckpointedBalance = sfsb.getCheckpointedBalance();
- boolean balanceOK = (preBalance != preCheckpointedBalance);
- if (!balanceOK) {
- System.out.println(testCaseName + " failing because: "
- + preBalance + " == " + preCheckpointedBalance
- + " failed");
- }
- stat.addStatus(testCaseName,
- ((nameOK && balanceOK) ? stat.PASS : stat.FAIL));
+ boolean nameOK = true;
+ nameOK = accountName.equals(sfsb.getAccountHolderName());
+ int preBalance = sfsb.getBalance();
+ int preCheckpointedBalance = sfsb.getCheckpointedBalance();
+ boolean balanceOK = (preBalance != preCheckpointedBalance);
+ if (!balanceOK) {
+ System.out.println(testCaseName + " failing because: "
+ + preBalance + " == " + preCheckpointedBalance
+ + " failed");
+ }
+ stat.addStatus(testCaseName,
+ ((nameOK && balanceOK) ? stat.PASS : stat.FAIL));
} catch (Exception ex) {
- stat.addStatus(testCaseName, stat.FAIL);
+ stat.addStatus(testCaseName, stat.FAIL);
}
}
public void nonTxNonCheckpointTest() {
- String testCaseName = "ee.multiClient nonTxNonCheckpointTest ";
+ String testCaseName = "ee.multiClient nonTxNonCheckpointTest ";
try {
- int preBalance = sfsb.getBalance();
- int preCheckpointedBalance = sfsb.getCheckpointedBalance();
- sfsb.incrementBalance(INCREMENT_VAL);
- sfsb.nonTxNonCheckpointedMethod();
- int postBalance = sfsb.getBalance();
- int postCheckpointedBalance = sfsb.getCheckpointedBalance();
+ int preBalance = sfsb.getBalance();
+ int preCheckpointedBalance = sfsb.getCheckpointedBalance();
+ sfsb.incrementBalance(INCREMENT_VAL);
+ sfsb.nonTxNonCheckpointedMethod();
+ int postBalance = sfsb.getBalance();
+ int postCheckpointedBalance = sfsb.getCheckpointedBalance();
- boolean ok = (preBalance+INCREMENT_VAL== postBalance)
- && (preCheckpointedBalance == postCheckpointedBalance);
- if (!ok) {
- System.out.println(testCaseName + " failing because: "
- + "(" + preBalance + " + " + INCREMENT_VAL
- + " == " + postBalance + ")"
- + " && (" + preCheckpointedBalance + " == "
- + postCheckpointedBalance + ")"
- + " failed");
- }
- stat.addStatus(testCaseName, (ok ? stat.PASS : stat.FAIL));
+ boolean ok = (preBalance+INCREMENT_VAL== postBalance)
+ && (preCheckpointedBalance == postCheckpointedBalance);
+ if (!ok) {
+ System.out.println(testCaseName + " failing because: "
+ + "(" + preBalance + " + " + INCREMENT_VAL
+ + " == " + postBalance + ")"
+ + " && (" + preCheckpointedBalance + " == "
+ + postCheckpointedBalance + ")"
+ + " failed");
+ }
+ stat.addStatus(testCaseName, (ok ? stat.PASS : stat.FAIL));
} catch (Exception ex) {
- ex.printStackTrace();
- stat.addStatus(testCaseName, stat.FAIL);
+ ex.printStackTrace();
+ stat.addStatus(testCaseName, stat.FAIL);
}
}
public void nonTxCheckpointTest() {
- String testCaseName = "ee.multiClient nonTxCheckpointTest ";
+ String testCaseName = "ee.multiClient nonTxCheckpointTest ";
try {
- int preBalance = sfsb.getBalance();
- int preCheckpointedBalance = sfsb.getCheckpointedBalance();
- sfsb.incrementBalance(INCREMENT_VAL);
- sfsb.nonTxCheckpointedMethod();
- int postBalance = sfsb.getBalance();
- int postCheckpointedBalance = sfsb.getCheckpointedBalance();
+ int preBalance = sfsb.getBalance();
+ int preCheckpointedBalance = sfsb.getCheckpointedBalance();
+ sfsb.incrementBalance(INCREMENT_VAL);
+ sfsb.nonTxCheckpointedMethod();
+ int postBalance = sfsb.getBalance();
+ int postCheckpointedBalance = sfsb.getCheckpointedBalance();
- boolean ok = (preBalance+INCREMENT_VAL == postBalance)
- && (preCheckpointedBalance != postCheckpointedBalance)
- && (postBalance == postCheckpointedBalance);
- stat.addStatus(testCaseName, (ok ? stat.PASS : stat.FAIL));
+ boolean ok = (preBalance+INCREMENT_VAL == postBalance)
+ && (preCheckpointedBalance != postCheckpointedBalance)
+ && (postBalance == postCheckpointedBalance);
+ stat.addStatus(testCaseName, (ok ? stat.PASS : stat.FAIL));
} catch (Exception ex) {
- ex.printStackTrace();
- stat.addStatus(testCaseName, stat.FAIL);
+ ex.printStackTrace();
+ stat.addStatus(testCaseName, stat.FAIL);
}
}
private void sleepFor(int seconds) {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<seconds; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<seconds; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
}
} //Client{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/descriptor/sun-ejb-jar.xml
index c138ede..c56f4b6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/descriptor/sun-ejb-jar.xml
@@ -23,14 +23,14 @@
<ejb>
<ejb-name>SFSBEJB</ejb-name>
<jndi-name>ejb/ejb_ee_methodcheckpoint_multi_SFSB</jndi-name>
- <checkpoint-at-end-of-method>
- <method>
- <method-name>nonTxCheckpointedMethod</method-name>
- </method>
- <method>
- <method-name>txCheckpointedMethod</method-name>
- </method>
- </checkpoint-at-end-of-method>
+ <checkpoint-at-end-of-method>
+ <method>
+ <method-name>nonTxCheckpointedMethod</method-name>
+ </method>
+ <method>
+ <method-name>txCheckpointedMethod</method-name>
+ </method>
+ </checkpoint-at-end-of-method>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java
index 69b1e1f..6369ac1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java
@@ -24,30 +24,30 @@
{
public String getAccountHolderName()
- throws RemoteException;
+ throws RemoteException;
public int getBalance()
- throws RemoteException;
+ throws RemoteException;
public void incrementBalance(int val)
- throws RemoteException;
+ throws RemoteException;
public int getCheckpointedBalance()
- throws RemoteException;
+ throws RemoteException;
public void nonTxNonCheckpointedMethod()
- throws RemoteException;
+ throws RemoteException;
public void nonTxCheckpointedMethod()
- throws RemoteException;
+ throws RemoteException;
public void txNonCheckpointedMethod()
- throws RemoteException;
+ throws RemoteException;
public void txCheckpointedMethod()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java
index 149c2ca..9927ab5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java
@@ -30,18 +30,18 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private SessionContext sessionCtx;
-
+
private String accountHolderName;
- private transient int balance;
- private int checkpointedBalance;
+ private transient int balance;
+ private int checkpointedBalance;
public void ejbCreate(String accountHolderName, int balance) {
this.accountHolderName = accountHolderName;
- this.balance = balance;
+ this.balance = balance;
}
public void setSessionContext(SessionContext sc) {
@@ -51,11 +51,11 @@
public void ejbRemove() {}
public void ejbActivate() {
- balance = checkpointedBalance;
+ balance = checkpointedBalance;
}
public void ejbPassivate() {
- checkpointedBalance = balance;
+ checkpointedBalance = balance;
}
public String getAccountHolderName() {
@@ -63,15 +63,15 @@
}
public int getBalance() {
- return balance;
+ return balance;
}
public void incrementBalance(int val) {
- balance += val;
+ balance += val;
}
public int getCheckpointedBalance() {
- return checkpointedBalance;
+ return checkpointedBalance;
}
public void nonTxNonCheckpointedMethod() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java
index f623efb..226d7ed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java
@@ -24,6 +24,6 @@
extends EJBHome
{
public SFSB create(String accountHolderName, int balance)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.properties
index 8162c70..c7ce4b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-methodcheckpoint-simple"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.xml
index 3d6b8ec..afdf56a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
index b420d80..bcb278f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private SFSBHome home;
@@ -44,13 +44,13 @@
client.doTest();
System.out.println("[simpletxClient] DONE doTest()...");
stat.printSummary("simpletx");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
accessSFSB(); //access the SFBS
}
@@ -76,26 +76,26 @@
public void accessSFSB() {
try {
- boolean actCountOK = true;
- System.out.println("ActivateCount[0]: " + sfsb.getActivateCount());
- actCountOK = sfsb.getActivateCount() == 0;
+ boolean actCountOK = true;
+ System.out.println("ActivateCount[0]: " + sfsb.getActivateCount());
+ actCountOK = sfsb.getActivateCount() == 0;
- String retrievedName = sfsb.getName();
- boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
- System.out.println("ActivateCount[1]: " + sfsb.getActivateCount());
- actCountOK = (sfsb.getActivateCount() == 1);
+ String retrievedName = sfsb.getName();
+ boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
+ System.out.println("ActivateCount[1]: " + sfsb.getActivateCount());
+ actCountOK = (sfsb.getActivateCount() == 1);
- System.out.println("ActivateCount[2]: " + sfsb.getActivateCount());
- sfsb.getPassivateCount();
- actCountOK = (sfsb.getActivateCount() == 1);
+ System.out.println("ActivateCount[2]: " + sfsb.getActivateCount());
+ sfsb.getPassivateCount();
+ actCountOK = (sfsb.getActivateCount() == 1);
- System.out.println("ActivateCount[3]: " + sfsb.getActivateCount());
- sfsb.getPassivateCount();
- actCountOK = (sfsb.getActivateCount() == 1);
+ System.out.println("ActivateCount[3]: " + sfsb.getActivateCount());
+ sfsb.getPassivateCount();
+ actCountOK = (sfsb.getActivateCount() == 1);
- System.out.println("ActivateCount[4]: " + sfsb.getActivateCount());
- sfsb.getPassivateCount();
- actCountOK = (sfsb.getActivateCount() == 1);
+ System.out.println("ActivateCount[4]: " + sfsb.getActivateCount());
+ sfsb.getPassivateCount();
+ actCountOK = (sfsb.getActivateCount() == 1);
if (nameOK && actCountOK) {
stat.addStatus("ejbclient accessSFSB ", stat.PASS);
@@ -109,14 +109,14 @@
}
private void sleepFor(int seconds) {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<seconds; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<seconds; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
}
} //Client{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/descriptor/sun-ejb-jar.xml
index 3949042..40c9033 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/descriptor/sun-ejb-jar.xml
@@ -23,11 +23,11 @@
<ejb>
<ejb-name>SFSBEJB</ejb-name>
<jndi-name>ejb/ejb_ee_methodcheckpoint_simple_SFSB</jndi-name>
- <checkpoint-at-end-of-method>
- <method>
- <method-name>getName</method-name>
- </method>
- </checkpoint-at-end-of-method>
+ <checkpoint-at-end-of-method>
+ <method>
+ <method-name>getName</method-name>
+ </method>
+ </checkpoint-at-end-of-method>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java
index cbfd931..2767e4c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java
@@ -24,12 +24,12 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public int getActivateCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivateCount()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java
index 98cc749..433efd8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -58,21 +58,21 @@
}
public int getActivateCount() {
- return activateCount;
+ return activateCount;
}
public int getPassivateCount() {
- return passivateCount;
+ return passivateCount;
}
public void ejbRemove() {}
public void ejbActivate() {
- activateCount++;
+ activateCount++;
}
public void ejbPassivate() {
- passivateCount++;
+ passivateCount++;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java
index a3f4a97..6f22dbd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java
@@ -24,6 +24,6 @@
extends EJBHome
{
public SFSB create(String sfsbName)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.properties
index b0ec730..444bdbb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-autotimer"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.xml
index 45a2a4f..ccf3d08 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.xml
@@ -126,11 +126,11 @@
</target>
<target name="compile-client" >
- <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
+ <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/*BaseDevTest.java">
</javac>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
destdir="${build.classes.dir}" debug="true" srcdir="client" includes="**/*.java">
<classpath path="${classpath}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/client/Client.java
index bb3527b..032ec51 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends AdminBaseDevTest {
@@ -165,7 +165,7 @@
InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
-
+
String line = null;
while ((line = input.readLine()) != null) {
System.out.println("Processing line: " + line);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java
index 6f1240f..9cc817f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String param = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + bean.timeoutReceived(param));
+ out.println("RESULT:" + bean.timeoutReceived(param));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.properties
index 6f9871e..ef1b548 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
cluster-name is set to cluster1 in appserv-tests/config, and seems hard
to override. So still use cluster1
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.xml
index 7004d5e..5f9b44d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.xml
@@ -28,7 +28,7 @@
<project name="devtests.ejb.ee.timer" default="usage" basedir=".">
<property file="build.properties"/>
-
+
&commonSetup;
&commonBuild;
&eecommonBuild;
@@ -148,12 +148,12 @@
<target name="compile" depends="init-common">
<mkdir dir="${build.classes.dir}"/>
- <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
+ <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
classpath="${build.classes.dir}:${env.S1AS_HOME}/lib/javaee.jar:${env.APS_HOME}/lib/reportbuilder.jar:${env.APS_HOME}/lib/reporter.jar"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/AdminBaseDevTest.java">
</javac>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${build.classes.dir}:${env.S1AS_HOME}/lib/javaee.jar:${env.APS_HOME}/lib/reportbuilder.jar:${env.APS_HOME}/lib/reporter.jar"
destdir="${build.classes.dir}" debug="true" srcdir="src" includes="**/*.java">
</javac>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/MigrateTimersTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/MigrateTimersTest.java
index 3ec3075..9d74e2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/MigrateTimersTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/MigrateTimersTest.java
@@ -38,7 +38,7 @@
migrateTimersOutsideCluster();
} finally {
//all associated timers will be removed upon undeploy, even if some
- //instances are offline.
+ //instances are offline.
undeployEjb(cluster_name);
}
stat.printSummary();
@@ -48,7 +48,7 @@
//from the same cluster
public void migrateTimers() {
String testName = "migrateTimers";
-
+
//no automatic migration when stopping a instance since gms has been disabled
asadmin("stop-instance", instance_name_1);
AsadminReturn output = asadminWithOutput("migrate-timers", instance_name_1);
@@ -79,7 +79,7 @@
public void migrateTimersOutsideCluster() {
String testName = "migrateTimersOutsideCluster";
-
+
//no automatic migration when stopping a instance since gms has been disabled
asadmin("stop-instance", instance_name_1);
asadmin("start-instance", instance_name_3);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.properties
index 8129575..18f74cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-domaindeployment"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.xml
index a303ee2..3ef73ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.xml
@@ -203,11 +203,11 @@
</target>
<target name="compile-client" >
- <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
+ <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/*BaseDevTest.java">
</javac>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
destdir="${build.classes.dir}" debug="true" srcdir="client" includes="**/*.java">
<classpath path="${classpath}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/client/Client.java
index 992fe83..a6ca556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends AdminBaseDevTest {
@@ -148,7 +148,7 @@
InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
-
+
String line = null;
while ((line = input.readLine()) != null) {
System.out.println("Processing line: " + line);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java
index a3ec2b1..d61cf7d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
out.println("<html>");
out.println("<head>");
@@ -51,7 +51,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + bean.countTimers());
+ out.println("RESULT:" + bean.countTimers());
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.properties
index fe64c1e..78d6213 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-timer-failover"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.xml
index d51d96e..de57dc7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.xml
@@ -137,11 +137,11 @@
</target>
<target name="compile-client" >
- <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
+ <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/*BaseDevTest.java">
</javac>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
destdir="${build.classes.dir}" debug="true" srcdir="client" includes="**/*.java">
<classpath path="${classpath}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/client/Client.java
index 9d86b53..582ba02 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends AdminBaseDevTest {
@@ -165,7 +165,7 @@
InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
-
+
String line = null;
while ((line = input.readLine()) != null) {
System.out.println("Processing line: " + line);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java
index 6f1240f..9cc817f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String param = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + bean.timeoutReceived(param));
+ out.println("RESULT:" + bean.timeoutReceived(param));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.properties
index f5c09d2..17a3279 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-getalltimers"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.xml
index 58623d3..63f9cd4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.xml
@@ -129,11 +129,11 @@
</target>
<target name="compile-client" >
- <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
+ <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/*BaseDevTest.java">
</javac>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
destdir="${build.classes.dir}" debug="true" srcdir="client" includes="**/*.java">
<classpath path="${classpath}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/client/Client.java
index b14150c..cb21209 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/client/Client.java
@@ -133,7 +133,7 @@
InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
-
+
String line = null;
while ((line = input.readLine()) != null) {
System.out.println("Processing line: " + line);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java
index a65e267..adfedc6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java
@@ -44,7 +44,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String param = req.getQueryString();
out.println("<html>");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.properties
index 681a385..73ba256 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-txcheckpoint-bmtcmttx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.xml
index 2b113ae..b39bbea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
index 12edff9..8887a9d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
@@ -30,7 +30,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private BMTSessionHome home;
@@ -48,16 +48,16 @@
client.doTest();
System.out.println("[bmttx] DONE doTest()...");
stat.printSummary("bmttx");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSB(); //create SFSBs
+ initSFSB(); //create SFSBs
nonTxAccessCheck(); //access the SFBS
txAccessCheck(); //access the SFBS
- txBMTCMTAccess();
+ txBMTCMTAccess();
}
private void initSFSB() {
@@ -86,15 +86,15 @@
public void nonTxAccessCheck() {
try {
- String retrievedName = sfsb.getName();
- boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
- boolean actCountOK = (sfsb.getActivateCount() == 0);
+ String retrievedName = sfsb.getName();
+ boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
+ boolean actCountOK = (sfsb.getActivateCount() == 0);
if (nameOK && actCountOK) {
- retrievedName = cmtSfsb.getName();
- nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
- actCountOK = (cmtSfsb.getActivateCount() == 0);
- }
+ retrievedName = cmtSfsb.getName();
+ nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
+ actCountOK = (cmtSfsb.getActivateCount() == 0);
+ }
if (nameOK && actCountOK) {
stat.addStatus("bmtcmttx nonTxAccessCheck", stat.PASS);
@@ -109,21 +109,21 @@
public void txAccessCheck() {
try {
- String retrievedName = sfsb.getName();
- sfsb.startTx();
- sfsb.incrementCount();
- sfsb.commitTx();
+ String retrievedName = sfsb.getName();
+ sfsb.startTx();
+ sfsb.incrementCount();
+ sfsb.commitTx();
- boolean actCountOK = (sfsb.getActivateCount() == 1);
+ boolean actCountOK = (sfsb.getActivateCount() == 1);
if (actCountOK) {
stat.addStatus("bmtcmttx BMTtxAccessCheck", stat.PASS);
} else {
stat.addStatus("bmtcmttx BMTtxAccessCheck", stat.FAIL);
}
- cmtSfsb.incrementCount();
- int val = cmtSfsb.getActivateCount();
- actCountOK = (cmtSfsb.getActivateCount() == 1);
+ cmtSfsb.incrementCount();
+ int val = cmtSfsb.getActivateCount();
+ actCountOK = (cmtSfsb.getActivateCount() == 1);
if (actCountOK) {
stat.addStatus("bmtcmttx CMTtxAccessCheck", stat.PASS);
} else {
@@ -137,28 +137,28 @@
private void txBMTCMTAccess() {
try {
- boolean passed = true;
+ boolean passed = true;
- CMTSession cmt = sfsb.getCMTSession();
+ CMTSession cmt = sfsb.getCMTSession();
- int prevCount = sfsb.getActivateCount();
- int prevCMTCount = cmt.getActivateCount();
-
- sfsb.startTx();
+ int prevCount = sfsb.getActivateCount();
+ int prevCMTCount = cmt.getActivateCount();
- sfsb.incrementCount();
- passed = passed && (sfsb.getActivateCount() == prevCount);
+ sfsb.startTx();
- sfsb.accessCMTBean();
- passed = passed && (sfsb.getActivateCount() == prevCount);
+ sfsb.incrementCount();
+ passed = passed && (sfsb.getActivateCount() == prevCount);
- cmt = sfsb.getCMTSession();
- passed = passed && (sfsb.getActivateCount() == prevCount);
+ sfsb.accessCMTBean();
+ passed = passed && (sfsb.getActivateCount() == prevCount);
- sfsb.commitTx();
+ cmt = sfsb.getCMTSession();
+ passed = passed && (sfsb.getActivateCount() == prevCount);
- passed = passed && (sfsb.getActivateCount() == (prevCount+1));
- passed = passed && (cmt.getActivateCount() == (prevCMTCount+1));
+ sfsb.commitTx();
+
+ passed = passed && (sfsb.getActivateCount() == (prevCount+1));
+ passed = passed && (cmt.getActivateCount() == (prevCMTCount+1));
if (passed) {
stat.addStatus("bmtcmttx txBMTCMTAccess", stat.PASS);
@@ -171,14 +171,14 @@
}
}
private void sleepFor(int seconds) {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<seconds; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<seconds; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
}
} //Client{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/ejb-jar.xml
index db42b4a..264cd5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/ejb-jar.xml
@@ -35,7 +35,7 @@
<ejb-ref-type>Session</ejb-ref-type>
<home>com.sun.s1asdev.ejb.ee.ejb.CMTSessionHome</home>
<remote>com.sun.s1asdev.ejb.ee.ejb.CMTSession</remote>
- <ejb-link>CMTSession</ejb-link>
+ <ejb-link>CMTSession</ejb-link>
</ejb-ref>
<security-identity>
<use-caller-identity/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/sun-ejb-jar.xml
index 5598b5d..8880823 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<jndi-name>ejb/ejb_ee_bmtcmttx_BMTSession</jndi-name>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
</ejb>
<ejb>
@@ -33,7 +33,7 @@
<jndi-name>ejb/ejb_ee_bmtcmttx_CMTSession</jndi-name>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java
index 8b8837d..385bf74 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java
@@ -24,29 +24,29 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public int getActivateCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivateCount()
- throws RemoteException;
+ throws RemoteException;
public void startTx()
- throws RemoteException;
+ throws RemoteException;
public void commitTx()
- throws RemoteException;
+ throws RemoteException;
public void rollbackTx()
- throws RemoteException;
+ throws RemoteException;
public void incrementCount()
- throws RemoteException;
+ throws RemoteException;
public void accessCMTBean()
- throws RemoteException;
+ throws RemoteException;
public CMTSession getCMTSession()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java
index 0c801dd..9a31987 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class BMTSessionBean
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -39,11 +39,11 @@
private int activateCount;
private int passivateCount;
- private int count;
+ private int count;
private SessionContext sessionCtx;
private String sfsbName;
- private UserTransaction userTx;
+ private UserTransaction userTx;
private CMTSessionHome cmtHome;
private CMTSession cmtSfsb;
@@ -55,19 +55,19 @@
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
this.sfsbName = sfsbName;
- try {
- InitialContext ic = new InitialContext();
- Object objref = ic.lookup("java:comp/env/ejb/CMTSessionHome");
- cmtHome = (CMTSessionHome)PortableRemoteObject.narrow(
- objref, CMTSessionHome.class);
- cmtSfsb = (CMTSession) cmtHome.create(sfsbName);
+ try {
+ InitialContext ic = new InitialContext();
+ Object objref = ic.lookup("java:comp/env/ejb/CMTSessionHome");
+ cmtHome = (CMTSessionHome)PortableRemoteObject.narrow(
+ objref, CMTSessionHome.class);
+ cmtSfsb = (CMTSession) cmtHome.create(sfsbName);
- for (int i=0; i<MAX_SIZE; i++) {
- cmtSessions[i] = (CMTSession) cmtHome.create(sfsbName + i);
- }
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ for (int i=0; i<MAX_SIZE; i++) {
+ cmtSessions[i] = (CMTSession) cmtHome.create(sfsbName + i);
+ }
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public String getName() {
@@ -80,63 +80,63 @@
}
public void startTx() {
- try {
- userTx = sessionCtx.getUserTransaction();
- userTx.begin();
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ try {
+ userTx = sessionCtx.getUserTransaction();
+ userTx.begin();
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public void commitTx() {
- try {
- userTx.commit();
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ try {
+ userTx.commit();
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public void rollbackTx() {
- try {
- userTx.rollback();
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ try {
+ userTx.rollback();
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public void incrementCount() {
- count++;
+ count++;
}
public void accessCMTBean()
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
- cmtSfsb.incrementCount();
- for (int i=0; i<MAX_SIZE; i++) {
- cmtSessions[i].incrementCount();
- }
+ cmtSfsb.incrementCount();
+ for (int i=0; i<MAX_SIZE; i++) {
+ cmtSessions[i].incrementCount();
+ }
}
public CMTSession getCMTSession() {
- return cmtSfsb;
+ return cmtSfsb;
}
public int getActivateCount() {
- return activateCount;
+ return activateCount;
}
public int getPassivateCount() {
- return passivateCount;
+ return passivateCount;
}
public void ejbRemove() {}
public void ejbActivate() {
- activateCount++;
+ activateCount++;
}
public void ejbPassivate() {
- passivateCount++;
+ passivateCount++;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java
index 5af1269..239bad6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java
@@ -24,6 +24,6 @@
extends EJBHome
{
public BMTSession create(String sfsbName)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java
index 8105e44..a1c1eb4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java
@@ -24,15 +24,15 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public int getActivateCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivateCount()
- throws RemoteException;
+ throws RemoteException;
public void incrementCount()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java
index b6b78eb..06ec1c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class CMTSessionBean
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -39,7 +39,7 @@
private int activateCount;
private int passivateCount;
- private int count;
+ private int count;
private SessionContext sessionCtx;
private String sfsbName;
@@ -59,25 +59,25 @@
}
public void incrementCount() {
- count++;
+ count++;
}
public int getActivateCount() {
- return activateCount;
+ return activateCount;
}
public int getPassivateCount() {
- return passivateCount;
+ return passivateCount;
}
public void ejbRemove() {}
public void ejbActivate() {
- activateCount++;
+ activateCount++;
}
public void ejbPassivate() {
- passivateCount++;
+ passivateCount++;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java
index 1b72c60..5e6e187 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java
@@ -24,6 +24,6 @@
extends EJBHome
{
public CMTSession create(String sfsbName)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.properties
index 3c09bd3..5cef791 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-txcheckpoint-bmttx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.xml
index e9c69142..64b8d4f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
index 1b3aea0..8aa45bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private BMTSessionHome home;
@@ -44,14 +44,14 @@
client.doTest();
System.out.println("[bmttx] DONE doTest()...");
stat.printSummary("bmttx");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSB(); //create SFSBs
- checkPersistedFirstTime();
+ initSFSB(); //create SFSBs
+ checkPersistedFirstTime();
txAccessCheck(); //access the SFBS
}
@@ -76,96 +76,96 @@
public void checkPersistedFirstTime() {
try {
- int prevActCount = sfsb.getActivateCount();
- int nowActCount = sfsb.getActivateCount();
+ int prevActCount = sfsb.getActivateCount();
+ int nowActCount = sfsb.getActivateCount();
- sfsb.startTx();
- sfsb.getTxName();
- sfsb.commitTx();
+ sfsb.startTx();
+ sfsb.getTxName();
+ sfsb.commitTx();
- sfsb.startTx();
- sfsb.getTxName();
- sfsb.commitTx();
+ sfsb.startTx();
+ sfsb.getTxName();
+ sfsb.commitTx();
- stat.addStatus("ejbclient checkPersistedFirstTime"
- + "(" + prevActCount + " : " + nowActCount + " : "
- + sfsb.getActivateCount() + ")", stat.PASS);
- } catch (Exception ex) {
- stat.addStatus("ejbclient checkPersistedFirstTime", stat.FAIL);
- }
+ stat.addStatus("ejbclient checkPersistedFirstTime"
+ + "(" + prevActCount + " : " + nowActCount + " : "
+ + sfsb.getActivateCount() + ")", stat.PASS);
+ } catch (Exception ex) {
+ stat.addStatus("ejbclient checkPersistedFirstTime", stat.FAIL);
+ }
}
public void txAccessCheck() {
try {
- int prevActCount = 0;
- int nowActCount = 0;
-
- prevActCount = sfsb.getActivateCount();
- sfsb.getName();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient NonTxNonCheckpointedMethod"
- + " (" + prevActCount + " == " + nowActCount + ")",
- ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+ int prevActCount = 0;
+ int nowActCount = 0;
- prevActCount = sfsb.getActivateCount();
- sfsb.checkpoint();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient NonTxCheckpointedMethod"
- + " (" + prevActCount + " != " + nowActCount + ")",
- ((prevActCount != nowActCount) ? stat.PASS : stat.FAIL));
+ prevActCount = sfsb.getActivateCount();
+ sfsb.getName();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient NonTxNonCheckpointedMethod"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
- prevActCount = nowActCount;
- sfsb.startTx();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient utBeginCheck"
- + " (" + prevActCount + " == " + nowActCount + ")",
- ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+ prevActCount = sfsb.getActivateCount();
+ sfsb.checkpoint();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient NonTxCheckpointedMethod"
+ + " (" + prevActCount + " != " + nowActCount + ")",
+ ((prevActCount != nowActCount) ? stat.PASS : stat.FAIL));
- sfsb.incrementCount();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient TxBusinessMethodInsideTx"
- + " (" + prevActCount + " == " + nowActCount + ")",
- ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+ prevActCount = nowActCount;
+ sfsb.startTx();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient utBeginCheck"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
- sfsb.getTxName();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient TxMethodInsideTx"
- + " (" + prevActCount + " == " + nowActCount + ")",
- ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+ sfsb.incrementCount();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient TxBusinessMethodInsideTx"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
- sfsb.getName();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient NonTxMethodInsideTx"
- + " (" + prevActCount + " == " + nowActCount + ")",
- ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+ sfsb.getTxName();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient TxMethodInsideTx"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
- sfsb.checkpoint();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient checkpointedMethodInsideTx"
- + " (" + prevActCount + " == " + nowActCount + ")",
- ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+ sfsb.getName();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient NonTxMethodInsideTx"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
- sfsb.commitTx();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient commitTxCheck"
- + " (" + prevActCount + " == " + nowActCount + ")",
- (((prevActCount+1) == nowActCount) ? stat.PASS : stat.FAIL));
+ sfsb.checkpoint();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient checkpointedMethodInsideTx"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+
+ sfsb.commitTx();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient commitTxCheck"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ (((prevActCount+1) == nowActCount) ? stat.PASS : stat.FAIL));
} catch (Exception ex) {
- ex.printStackTrace();
+ ex.printStackTrace();
stat.addStatus("ejbclient txAccessCheck", stat.FAIL);
}
}
private void sleepFor(int seconds) {
- System.out.println("Waiting for " + seconds + " seconds before accessing...");
- for (int i=0; i<seconds; i++) {
- System.out.println("" + (seconds - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for " + seconds + " seconds before accessing...");
+ for (int i=0; i<seconds; i++) {
+ System.out.println("" + (seconds - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
}
} //Client{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/descriptor/sun-ejb-jar.xml
index be15662..25ab282 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/descriptor/sun-ejb-jar.xml
@@ -25,16 +25,16 @@
<jndi-name>ejb/ejb_ee_bmttx_BMTSession</jndi-name>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
- <checkpoint-at-end-of-method>
- <method>
- <method-name>checkpoint</method-name>
- </method>
- <method>
- <method-name>checkpoint2</method-name>
- </method>
- </checkpoint-at-end-of-method>
+ <checkpoint-at-end-of-method>
+ <method>
+ <method-name>checkpoint</method-name>
+ </method>
+ <method>
+ <method-name>checkpoint2</method-name>
+ </method>
+ </checkpoint-at-end-of-method>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java
index 117d1cc..d2dc5dd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java
@@ -24,33 +24,33 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public String getTxName()
- throws RemoteException;
+ throws RemoteException;
public void checkpoint()
- throws RemoteException;
+ throws RemoteException;
public void checkpoint2()
- throws RemoteException;
+ throws RemoteException;
public int getActivateCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivateCount()
- throws RemoteException;
+ throws RemoteException;
public void startTx()
- throws RemoteException;
+ throws RemoteException;
public void commitTx()
- throws RemoteException;
+ throws RemoteException;
public void rollbackTx()
- throws RemoteException;
+ throws RemoteException;
public void incrementCount()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java
index adcc198..a838ad0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class BMTSessionBean
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -39,11 +39,11 @@
private int activateCount;
private int passivateCount;
- private int count;
+ private int count;
private SessionContext sessionCtx;
private String sfsbName;
- private UserTransaction userTx;
+ private UserTransaction userTx;
public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
@@ -70,50 +70,50 @@
}
public void startTx() {
- try {
- userTx = sessionCtx.getUserTransaction();
- userTx.begin();
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ try {
+ userTx = sessionCtx.getUserTransaction();
+ userTx.begin();
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public void commitTx() {
- try {
- userTx.commit();
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ try {
+ userTx.commit();
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public void rollbackTx() {
- try {
- userTx.rollback();
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ try {
+ userTx.rollback();
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public void incrementCount() {
- count++;
+ count++;
}
public int getActivateCount() {
- return activateCount;
+ return activateCount;
}
public int getPassivateCount() {
- return passivateCount;
+ return passivateCount;
}
public void ejbRemove() {}
public void ejbActivate() {
- activateCount++;
+ activateCount++;
}
public void ejbPassivate() {
- passivateCount++;
+ passivateCount++;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java
index 5af1269..239bad6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java
@@ -24,6 +24,6 @@
extends EJBHome
{
public BMTSession create(String sfsbName)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/build.xml
index d286e90..6c36e60 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/build.xml
@@ -53,9 +53,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ee tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ee tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.properties
index 7c9bfa2..3fc6f69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-txcheckpoint-simpletx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.xml
index ef16a26..75c7008 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
index e3917bf..5f1ebb6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private SFSBHome home;
@@ -44,17 +44,17 @@
client.doTest();
System.out.println("[simpletxClient] DONE doTest()...");
stat.printSummary("simpletx");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
cmtNonTxAccess(); //access the SFBS
cmtTxAccess(); //access the SFBS
cmtNonTxAccess(sfsb); //access the SFBS
- removeTest();
+ removeTest();
}
private void initSFSBList() {
@@ -78,12 +78,12 @@
public void cmtTxAccess() {
try {
- int prevCount = sfsb.getActivateCount();
- String retrievedName = sfsb.getTxName();
- boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
- int nowCount = sfsb.getActivateCount();
- boolean actCountOK = (prevCount+1 == nowCount);
- String msg = "(" + prevCount + "+1 == " + nowCount + ")";
+ int prevCount = sfsb.getActivateCount();
+ String retrievedName = sfsb.getTxName();
+ boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
+ int nowCount = sfsb.getActivateCount();
+ boolean actCountOK = (prevCount+1 == nowCount);
+ String msg = "(" + prevCount + "+1 == " + nowCount + ")";
if (nameOK && actCountOK) {
stat.addStatus("ejbclient cmtTxAccess " + msg, stat.PASS);
} else {
@@ -97,12 +97,12 @@
public void cmtNonTxAccess() {
try {
- int prevCount = sfsb.getActivateCount();
- String retrievedName = sfsb.getName();
- boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
- int nowCount = sfsb.getActivateCount();
- boolean actCountOK = (prevCount == nowCount);
- String msg = "(" + prevCount + " == " + nowCount + ")";
+ int prevCount = sfsb.getActivateCount();
+ String retrievedName = sfsb.getName();
+ boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
+ int nowCount = sfsb.getActivateCount();
+ boolean actCountOK = (prevCount == nowCount);
+ String msg = "(" + prevCount + " == " + nowCount + ")";
if (nameOK && actCountOK) {
stat.addStatus("ejbclient cmtNonTxAccess " + msg, stat.PASS);
} else {
@@ -116,63 +116,63 @@
public void cmtNonTxAccess(SFSB sfsb) {
for (int i=0; i<200; i++) {
- try {
- int prevCount = sfsb.getActivateCount();
- String retrievedName = sfsb.getName();
- boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
- int nowCount = sfsb.getActivateCount();
- boolean actCountOK = (prevCount == nowCount);
- String msg = "(" + prevCount + " == " + nowCount + ")";
+ try {
+ int prevCount = sfsb.getActivateCount();
+ String retrievedName = sfsb.getName();
+ boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
+ int nowCount = sfsb.getActivateCount();
+ boolean actCountOK = (prevCount == nowCount);
+ String msg = "(" + prevCount + " == " + nowCount + ")";
if (nameOK && actCountOK) {
stat.addStatus("ejbclient cmtNonTxAccess_2 " + msg, stat.PASS);
} else {
- stat.addStatus("ejbclient cmtNonTxAccess_2", stat.FAIL);
+ stat.addStatus("ejbclient cmtNonTxAccess_2", stat.FAIL);
}
- System.out.println("[" + i + "] cmtNonTxAccess_2 status: " + (nameOK && actCountOK));
+ System.out.println("[" + i + "] cmtNonTxAccess_2 status: " + (nameOK && actCountOK));
} catch (Exception ex) {
stat.addStatus("ejbclient cmtNonTxAccess_2", stat.FAIL);
}
- sleepFor(1, false);
- }
+ sleepFor(1, false);
+ }
}
public void removeTest() {
- SFSB sfsb = null;
- boolean passed = false;
- try {
- String myName = "_2_" + _sfsbPrefix + "_2_";
- sfsb = (SFSB) home.create(myName);
- String retrievedName = sfsb.getTxName();
- boolean nameOK = myName.equalsIgnoreCase(retrievedName);
- sfsb.remove();
- try {
- sfsb.getTxName();
- passed = false; //Expecting an exception
- } catch (Exception ex) {
- passed = true;
- }
+ SFSB sfsb = null;
+ boolean passed = false;
+ try {
+ String myName = "_2_" + _sfsbPrefix + "_2_";
+ sfsb = (SFSB) home.create(myName);
+ String retrievedName = sfsb.getTxName();
+ boolean nameOK = myName.equalsIgnoreCase(retrievedName);
+ sfsb.remove();
+ try {
+ sfsb.getTxName();
+ passed = false; //Expecting an exception
+ } catch (Exception ex) {
+ passed = true;
+ }
if (passed) {
stat.addStatus("ejbclient removeTest_1 ", stat.PASS);
} else {
- stat.addStatus("ejbclient removeTest_1", stat.FAIL);
+ stat.addStatus("ejbclient removeTest_1", stat.FAIL);
}
- passed = false;
- myName = "_4_" + _sfsbPrefix + "_4_";
- sfsb = (SFSB) home.create(myName);
- retrievedName = sfsb.getName();
- nameOK = myName.equalsIgnoreCase(retrievedName);
- sfsb.remove();
- try {
- sfsb.getName();
- passed = false; //Expecting an exception
- } catch (Exception ex) {
- passed = true;
- }
+ passed = false;
+ myName = "_4_" + _sfsbPrefix + "_4_";
+ sfsb = (SFSB) home.create(myName);
+ retrievedName = sfsb.getName();
+ nameOK = myName.equalsIgnoreCase(retrievedName);
+ sfsb.remove();
+ try {
+ sfsb.getName();
+ passed = false; //Expecting an exception
+ } catch (Exception ex) {
+ passed = true;
+ }
if (passed) {
stat.addStatus("ejbclient removeTest_2 ", stat.PASS);
} else {
- stat.addStatus("ejbclient removeTest_2", stat.FAIL);
+ stat.addStatus("ejbclient removeTest_2", stat.FAIL);
}
} catch (Exception ex) {
@@ -181,22 +181,22 @@
}
private void sleepFor(int seconds) {
- sleepFor(seconds, true);
+ sleepFor(seconds, true);
}
private void sleepFor(int seconds, boolean verbose) {
- if (verbose) {
- System.out.println("Waiting for " + seconds + " before accessing...");
- }
- for (int i=0; i<seconds; i++) {
- if (verbose) {
- System.out.println("" + (seconds - i) + " seconds left...");
- }
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ if (verbose) {
+ System.out.println("Waiting for " + seconds + " before accessing...");
+ }
+ for (int i=0; i<seconds; i++) {
+ if (verbose) {
+ System.out.println("" + (seconds - i) + " seconds left...");
+ }
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
}
} //Client{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/descriptor/sun-ejb-jar.xml
index 872d74c..3fccde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/descriptor/sun-ejb-jar.xml
@@ -25,8 +25,8 @@
<jndi-name>ejb/ejb_ee_txcheckpoint_simpletx_SFSB</jndi-name>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
- <removal-timeout-in-seconds>60</removal-timeout-in-seconds>
+ <resize-quantity>4</resize-quantity>
+ <removal-timeout-in-seconds>60</removal-timeout-in-seconds>
</bean-cache>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java
index 50288b5..939c12b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java
@@ -24,15 +24,15 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public String getTxName()
- throws RemoteException;
+ throws RemoteException;
public int getActivateCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivateCount()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java
index 253149b..b4b2388 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -60,21 +60,21 @@
}
public int getActivateCount() {
- return activateCount;
+ return activateCount;
}
public int getPassivateCount() {
- return passivateCount;
+ return passivateCount;
}
public void ejbRemove() {}
public void ejbActivate() {
- activateCount++;
+ activateCount++;
}
public void ejbPassivate() {
- passivateCount++;
+ passivateCount++;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java
index 82a15e9..fe8bd43 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java
@@ -24,6 +24,6 @@
extends EJBHome
{
public SFSB create(String sfsbName)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.properties
index d873ee2..a0941b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb30-allowed"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.xml
index 58cefeb..7d62159 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.xml
@@ -35,7 +35,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,14 +47,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sless.class, **/*Operation.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -62,10 +62,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java
index 8f45ca5..592ea3b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,39 +34,39 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-allowed-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB Sless sless;
public void doTest() {
try {
- sless.sayHello();
+ sless.sayHello();
stat.addStatus("local setup", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("local setup", stat.FAIL);
}
- boolean result = false;
+ boolean result = false;
try {
- result = sless.lookupUserTransactionFromBMTBean();
- } catch (Exception ex) {
+ result = sless.lookupUserTransactionFromBMTBean();
+ } catch (Exception ex) {
stat.addStatus("local BMTOp_Ex", stat.FAIL);
- }
+ }
stat.addStatus("local BMTUserTx",
- (result ? stat.PASS : stat.FAIL));
+ (result ? stat.PASS : stat.FAIL));
try {
- result = sless.lookupUserTransactionFromCMTBean();
- } catch (Exception ex) {
+ result = sless.lookupUserTransactionFromCMTBean();
+ } catch (Exception ex) {
stat.addStatus("local CMTOp_Ex", stat.FAIL);
- }
+ }
stat.addStatus("local CMTUserTx",
- (result ? stat.PASS : stat.FAIL));
+ (result ? stat.PASS : stat.FAIL));
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java
index d26cd03..46862ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java
@@ -30,15 +30,15 @@
private CMTOperation cmtOp;
public String sayHello() {
- return "Hello";
+ return "Hello";
}
public boolean lookupUserTransactionFromCMTBean() {
- return cmtOp.lookupUserTransaction();
+ return cmtOp.lookupUserTransaction();
}
public boolean lookupUserTransactionFromBMTBean() {
- return bmtOp.lookupUserTransaction();
+ return bmtOp.lookupUserTransaction();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/build.xml
index bbfda43..f117638 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/build.xml
@@ -29,12 +29,12 @@
&reporting;
<target name="all">
- <!--- currently use SE client . switch back to appclient -->
+ <!--- currently use SE client . switch back to appclient -->
<antcall target="allowed"/>
<antcall target="clientview"/>
<antcall target="hello"/>
<antcall target="interceptors"/>
- <antcall target="persistence"/>
+ <antcall target="persistence"/>
</target>
@@ -69,9 +69,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb30 tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb30 tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.properties
index dc9d71c..74989f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-clientview-adapted"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="se.client" value="com.sun.s1asdev.ejb.ejb30.clientview.adapted.client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.xml
index 0f964b0..43ffc4d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Common*.class,**/Dummy*.class,**/Hello*.class,**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/DummySless*.class,**/DummyRemote*.class,**/Hello.class,**/SfulRemoteHome.class,**/SlessRemoteHome.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
</target>
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -71,10 +71,10 @@
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java
index a9a712c..358488e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
static final int NUM_EXTRA_HELLOS = 6;
@@ -41,26 +41,26 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-clientview-adaptedID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
Set<Hello> hellos = new HashSet<Hello>();
try {
- String lookupStr =
- "java:comp/env/com.sun.s1asdev.ejb.ejb30.clientview.adapted.client.Client/hr";
+ String lookupStr =
+ "java:comp/env/com.sun.s1asdev.ejb.ejb30.clientview.adapted.client.Client/hr";
- if( hr == null ) {
- System.out.println("In stand-alone mode");
- lookupStr = "ejb/ejb_ejb30_clientview_adapted_Hello";
- hr = (Hello) new InitialContext().lookup(lookupStr);
- }
+ if( hr == null ) {
+ System.out.println("In stand-alone mode");
+ lookupStr = "ejb/ejb_ejb30_clientview_adapted_Hello";
+ hr = (Hello) new InitialContext().lookup(lookupStr);
+ }
hellos.add(hr);
InitialContext ic = new InitialContext();
@@ -76,23 +76,23 @@
int numPassivatedActivated = 0;
for(Hello next : hellos) {
-
-
- if( next.hasBeenPassivatedActivated() ) {
+
+
+ if( next.hasBeenPassivatedActivated() ) {
numPassivatedActivated++;
}
-
+
System.out.println("Running test for " + next);
// do something right here
System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
next.warmup(Common.STATEFUL);
runTests(Common.STATEFUL, next);
-
+
System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
next.warmup(Common.STATEFUL);
runTests(Common.STATELESS, next);
-
+
next.shutdown();
}
@@ -100,26 +100,26 @@
throw new Exception("Passivation/Activation could not be tested. No Passivation/Activation occurred");
}
- System.out.println("Hellos.size() : " + hellos.size() + " passivationCount: " + numPassivatedActivated);
-
- stat.addStatus("local main", stat.PASS);
+ System.out.println("Hellos.size() : " + hellos.size() + " passivationCount: " + numPassivatedActivated);
- boolean refResult1 = hr.checkSlessLocalReferences();
- stat.addStatus("local checkSlessReferences",
- (refResult1 == true) ? stat.PASS : stat.FAIL);
+ stat.addStatus("local main", stat.PASS);
- boolean refResult2 = hr.checkSfulLocalReferences();
- stat.addStatus("local checkSfulLocalReferences",
- (refResult2 == true) ? stat.PASS : stat.FAIL);
-
+ boolean refResult1 = hr.checkSlessLocalReferences();
+ stat.addStatus("local checkSlessReferences",
+ (refResult1 == true) ? stat.PASS : stat.FAIL);
+
+ boolean refResult2 = hr.checkSfulLocalReferences();
+ stat.addStatus("local checkSfulLocalReferences",
+ (refResult2 == true) ? stat.PASS : stat.FAIL);
+
boolean refSlessResult = hr.checkSlessRemoteReferences();
- stat.addStatus("local checkSlessRemoteReferences",
- (refSlessResult == true) ? stat.PASS : stat.FAIL);
-
+ stat.addStatus("local checkSlessRemoteReferences",
+ (refSlessResult == true) ? stat.PASS : stat.FAIL);
+
boolean refResult3 = hr.checkSfulRemoteReferences();
- stat.addStatus("local checkSfulRemoteReferences",
- (refResult3 == true) ? stat.PASS : stat.FAIL);
-
+ stat.addStatus("local checkSfulRemoteReferences",
+ (refResult3 == true) ? stat.PASS : stat.FAIL);
+
DummyRemote ref1 = hr.getSfulRemoteBusiness(1);
DummyRemote ref2 = hr.getSfulRemoteBusiness(2);
boolean refResult4 = ref1.equals(ref1);
@@ -130,7 +130,7 @@
boolean refResult9 = hr.compareRemoteRefs(ref1, ref2);
boolean refResult10 = hr.compareRemoteRefs(ref1, hr);
boolean refResult11 = hr.compareRemoteRefs(ref1, null);
-
+
boolean refResultSummary = (refResult4 == true)
&& (refResult5 == true)
&& (refResult6 == false)
@@ -139,34 +139,34 @@
&& (refResult9 == false)
&& (refResult10 == false)
&& (refResult11 == false);
-
+
stat.addStatus("local compareRemoteReferences",
- (refResult3 == true) ? stat.PASS : stat.FAIL);
-
+ (refResult3 == true) ? stat.PASS : stat.FAIL);
+
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
-
+
private void runTests(int type, Hello hr)
- throws Exception
+ throws Exception
{
-
+
hr.notSupported(type, true);
hr.notSupported(type, false);
hr.supports(type, true);
- hr.supports(type, false);
+ hr.supports(type, false);
hr.required(type, true);
- hr.required(type, false);
+ hr.required(type, false);
hr.requiresNew(type, true);
- hr.requiresNew(type, false);
+ hr.requiresNew(type, false);
hr.mandatory(type, true);
- hr.never(type, false);
+ hr.never(type, false);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/descriptor/sun-ejb-jar.xml
index 39a4b78..1635486 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/descriptor/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<jndi-name>ejb/ejb_ejb30_clientview_adapted_Hello</jndi-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>1</resize-quantity>
+ <resize-quantity>1</resize-quantity>
<cache-idle-timeout-in-seconds>5</cache-idle-timeout-in-seconds>
</bean-cache>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java
index c5c7ae2..70b5fb0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java
@@ -18,7 +18,7 @@
import jakarta.ejb.*;
-public interface Common
+public interface Common
{
public static final int STATELESS = 0;
public static final int STATEFUL = 1;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/CommonRemoteLocalBusinessSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/CommonRemoteLocalBusinessSuper.java
index 010d7e7..c7e0725 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/CommonRemoteLocalBusinessSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/CommonRemoteLocalBusinessSuper.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-public interface CommonRemoteLocalBusinessSuper
+public interface CommonRemoteLocalBusinessSuper
{
void sharedRemoteLocalBusinessSuper(boolean expectTx);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java
index 55b0525..8e0a4c4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java
@@ -38,15 +38,15 @@
boolean checkSlessLocalReferences();
boolean checkSfulLocalReferences();
-
+
public boolean checkSlessRemoteReferences();
-
+
public boolean checkSfulRemoteReferences();
public DummyRemote getSfulRemoteBusiness(int num);
-
+
public DummyRemote2 getSfulRemoteBusiness2(int num);
-
+
public boolean compareRemoteRefs(Object ref1, Object ref2);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java
index 3a17bce..db122eb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java
@@ -38,13 +38,13 @@
context = sc;
}
- @EJB private SlessBusiness2 slessBusiness2;
+ @EJB private SlessBusiness2 slessBusiness2;
@EJB private SfulBusiness2 sfulBusiness2;
- @EJB protected SlessRemoteBusiness2 slessRemoteBusiness2;
+ @EJB protected SlessRemoteBusiness2 slessRemoteBusiness2;
@EJB public SfulRemoteBusiness2 sfulRemoteBusiness2;
@EJB public SfulHome sfulHome;
- public Sful sful;
+ public Sful sful;
@EJB public SfulBusiness sfulBusiness;
@@ -54,7 +54,7 @@
@EJB public SlessBusiness slessBusiness;
@EJB public SfulRemoteHome sfulRemoteHome;
- public SfulRemote sfulRemote;
+ public SfulRemote sfulRemote;
@EJB public SfulRemoteBusiness sfulRemoteBusiness;
@@ -70,30 +70,30 @@
jakarta.transaction.UserTransaction ut;
- @EJB private SlessBusiness refSless_1;
- @EJB private SlessBusiness refSless_2;
- @EJB private SlessBusiness2 refSless2_1;
- @EJB private SlessBusiness2 refSless2_2;
+ @EJB private SlessBusiness refSless_1;
+ @EJB private SlessBusiness refSless_2;
+ @EJB private SlessBusiness2 refSless2_1;
+ @EJB private SlessBusiness2 refSless2_2;
- @EJB private SfulBusiness refSful_1;
- @EJB private SfulBusiness refSful_2;
- @EJB private SfulBusiness2 refSful2_1;
- @EJB private SfulBusiness2 refSful2_2;
-
- @EJB private DummySlessRemote refRemoteSless_1;
- @EJB private DummySlessRemote refRemoteSless_2;
- @EJB private DummySlessRemote2 refRemoteSless2_1;
- @EJB private DummySlessRemote2 refRemoteSless2_2;
-
- @EJB private DummyRemote refRemoteSful_1;
- @EJB private DummyRemote refRemoteSful_2;
- @EJB private DummyRemote2 refRemoteSful2_1;
- @EJB private DummyRemote2 refRemoteSful2_2;
+ @EJB private SfulBusiness refSful_1;
+ @EJB private SfulBusiness refSful_2;
+ @EJB private SfulBusiness2 refSful2_1;
+ @EJB private SfulBusiness2 refSful2_2;
+
+ @EJB private DummySlessRemote refRemoteSless_1;
+ @EJB private DummySlessRemote refRemoteSless_2;
+ @EJB private DummySlessRemote2 refRemoteSless2_1;
+ @EJB private DummySlessRemote2 refRemoteSless2_2;
+
+ @EJB private DummyRemote refRemoteSful_1;
+ @EJB private DummyRemote refRemoteSful_2;
+ @EJB private DummyRemote2 refRemoteSful2_1;
+ @EJB private DummyRemote2 refRemoteSful2_2;
@PostConstruct
public void create() {
- try {
+ try {
slessBusiness2.foo();
sfulBusiness2.foo();
@@ -114,10 +114,10 @@
sfulRemoteBusiness2.bar();
sful = sfulHome.create();
- System.out.println("Created local sful objs via homes.");
+ System.out.println("Created local sful objs via homes.");
sless = slessHome.create();
- System.out.println("Created local sless objs via homes.");
+ System.out.println("Created local sless objs via homes.");
// There are two create<METHOD> methods with the same signature.
// The first is mapped to an @Init method that ignores its input
@@ -143,18 +143,18 @@
}
slessRemote = slessRemoteHome.create();
- System.out.println("Created remote sless objs via homes.");
+ System.out.println("Created remote sless objs via homes.");
ut = context.getUserTransaction();
-
- System.out.println("**1** refSlessBusiness_1 : " + refSless_1);
- System.out.println("**1** refSlessBusiness_2 : " + refSless_2);
- System.out.println("**1** refSlessBusiness2_1 : " + refSless2_1);
- System.out.println("**1** refSlessBusiness2_2 : " + refSless2_2);
- System.out.println("**1** checkLocalReferences() ==> " + checkSlessLocalReferences());
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+
+ System.out.println("**1** refSlessBusiness_1 : " + refSless_1);
+ System.out.println("**1** refSlessBusiness_2 : " + refSless_2);
+ System.out.println("**1** refSlessBusiness2_1 : " + refSless2_1);
+ System.out.println("**1** refSlessBusiness2_2 : " + refSless2_2);
+ System.out.println("**1** checkLocalReferences() ==> " + checkSlessLocalReferences());
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
}
@PrePassivate public void prePassivate() {
@@ -165,12 +165,12 @@
@PostActivate public void postActivate() {
System.out.println("In HelloEJB::postActivate");
- // @@@ temporary workaround until UserTransaction serialization is fixed
- ut = context.getUserTransaction();
+ // @@@ temporary workaround until UserTransaction serialization is fixed
+ ut = context.getUserTransaction();
activateCount++;
}
-
+
public void shutdown() throws EJBException {
try {
@@ -185,7 +185,7 @@
}
try {
- sfulBusiness.remove();
+ sfulBusiness.remove();
throw new EJBException("2nd sfulBusiness remove should have caused exception");
} catch(Exception e) {
System.out.println("Successfully caught exception when attempting to "+
@@ -194,7 +194,7 @@
sful.remove();
try {
- sful.remove();
+ sful.remove();
throw new EJBException("2nd sful remove should have caused exception");
} catch(Exception e) {
System.out.println("Successfully caught exception when attempting to "+
@@ -216,7 +216,7 @@
}
try {
- sfulRemoteBusiness.remove();
+ sfulRemoteBusiness.remove();
throw new EJBException("2nd sfulRemoteBusiness remove should have caused exception");
} catch(Exception e) {
System.out.println("Successfully caught exception when attempting to "+
@@ -225,7 +225,7 @@
sfulRemote.remove();
try {
- sfulRemote.remove();
+ sfulRemote.remove();
throw new EJBException("2nd sfulRemote remove should have caused exception");
} catch(Exception e) {
System.out.println("Successfully caught exception when attempting to "+
@@ -235,7 +235,7 @@
// Doesn't matter how many times we call slessRemote remove()
slessRemote.remove();
slessRemote.remove();
-
+
} catch(Exception e) {
EJBException ejbEx = new EJBException();
@@ -273,85 +273,85 @@
warmup(type, true, false);
warmup(type, false, true);
warmup(type, false, false);
-
- // Measure looping and timing overhead
+
+ // Measure looping and timing overhead
long begin = System.currentTimeMillis();
for ( int i=0; i<ITERATIONS; i++ ) {
}
long end = System.currentTimeMillis();
overhead = end - begin;
-
+
ut = context.getUserTransaction();
-
+
testLocalObjects(sful, sless);
testEJBObjects(sfulRemote, slessRemote);
-
+
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
}
- private void warmup(int type, boolean tx, boolean businessView)
+ private void warmup(int type, boolean tx, boolean businessView)
throws Exception {
- // get Hotspot warmed up
- Common bean = pre(type, tx, businessView);
- CommonRemote beanRemote = preRemote(type, tx, businessView);
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
+ // get Hotspot warmed up
+ Common bean = pre(type, tx, businessView);
+ CommonRemote beanRemote = preRemote(type, tx, businessView);
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
beanRemote.requiresNew();
- bean.notSupported();
+ bean.notSupported();
beanRemote.notSupported();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
beanRemote.required();
- if ( tx ) {
- bean.mandatory();
+ if ( tx ) {
+ bean.mandatory();
beanRemote.mandatory();
} else {
- bean.never();
+ bean.never();
beanRemote.never();
}
- bean.supports();
+ bean.supports();
beanRemote.supports();
- }
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
+ }
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
}
- private Common pre(int type, boolean tx, boolean businessView)
+ private Common pre(int type, boolean tx, boolean businessView)
{
- if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
- ex.printStackTrace();
- }
+ if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
+ ex.printStackTrace();
+ }
- if ( type == Common.STATELESS )
+ if ( type == Common.STATELESS )
return businessView ? slessBusiness : sless;
- else
+ else
return businessView ? sfulBusiness : sful;
}
- private CommonRemote preRemote(int type, boolean tx, boolean businessView)
- {
- if ( type == Common.STATELESS ) {
- return businessView ? slessRemoteBusiness : slessRemote;
+ private CommonRemote preRemote(int type, boolean tx, boolean businessView)
+ {
+ if ( type == Common.STATELESS ) {
+ return businessView ? slessRemoteBusiness : slessRemote;
} else {
- return businessView ? sfulRemoteBusiness : sfulRemote;
+ return businessView ? sfulRemoteBusiness : sfulRemote;
}
}
private float post(long begin, long end, boolean tx)
{
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
- ex.printStackTrace();
- }
- return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
+ ex.printStackTrace();
+ }
+ return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
}
- public float requiresNew(int type, boolean tx)
+ public float requiresNew(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -381,7 +381,7 @@
return post(begin, end, tx);
}
- public float notSupported(int type, boolean tx)
+ public float notSupported(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -407,11 +407,11 @@
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
- }
- return post(begin, end, tx);
+ }
+ return post(begin, end, tx);
}
- public float required(int type, boolean tx)
+ public float required(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -433,16 +433,16 @@
for ( int i=0; i<ITERATIONS; i++ ) {
beanRemoteBusiness.required();
}
-
+
end = System.currentTimeMillis();
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
- public float mandatory(int type, boolean tx)
+ public float mandatory(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -451,7 +451,7 @@
Common busBean = pre(type, tx, true);
CommonRemote beanRemote = preRemote(type, tx, false);
CommonRemote beanRemoteBusiness = preRemote(type, tx, true);
- begin = System.currentTimeMillis();
+ begin = System.currentTimeMillis();
for ( int i=0; i<ITERATIONS; i++ ) {
bean.mandatory();
}
@@ -470,7 +470,7 @@
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
public float never(int type, boolean tx)
@@ -500,10 +500,10 @@
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
- public float supports(int type, boolean tx)
+ public float supports(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -531,7 +531,7 @@
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
// assumes lo1 and lo2 are do not have same client identity
@@ -575,11 +575,11 @@
if( o1.isIdentical(o2) ) {
throw new EJBException("isIdentical failed");
}
-
+
if( o2.isIdentical(o1) ) {
throw new EJBException("isIdentical failed");
}
-
+
if( !o1.isIdentical(o1) ) {
throw new EJBException("isIdentical failed");
}
@@ -607,7 +607,7 @@
if( md == null ) {
throw new EJBException("null md");
}
- System.out.println("md = " + md);
+ System.out.println("md = " + md);
HomeHandle hh = home.getHomeHandle();
if( hh == null ) {
@@ -633,18 +633,18 @@
}
o1.hashCode();
-
+
o2.hashCode();
-
+
o1.toString();
o2.toString();
-
+
}
-
+
public boolean checkSlessLocalReferences() {
boolean result = (refSless_1 != null);
-
+
result = result && refSless_1.equals(refSless_1);
result = result && refSless_1.equals(refSless_2);
result = result && (! refSless_1.equals(refSless2_1));
@@ -655,7 +655,7 @@
result = result && (! refSless_1.equals(sfulBusiness));
result = result && (! refSless_1.equals(sfulRemote));
result = result && (! refSless_1.equals(sfulRemoteHome));
-
+
result = result && (refSless_2 != null);
result = result && refSless_2.equals(refSless_1);
result = result && refSless_2.equals(refSless_2);
@@ -667,7 +667,7 @@
result = result && (! refSless_2.equals(sfulBusiness));
result = result && (! refSless_2.equals(sfulRemote));
result = result && (! refSless_2.equals(sfulRemoteHome));
-
+
result = result && (refSless2_1 != null);
result = result && refSless2_1.equals(refSless2_1);
result = result && refSless2_1.equals(refSless2_2);
@@ -679,7 +679,7 @@
result = result && (! refSless2_1.equals(sfulBusiness));
result = result && (! refSless2_1.equals(sfulRemote));
result = result && (! refSless2_1.equals(sfulRemoteHome));
-
+
result = result && (refSless2_2 != null);
result = result && refSless2_2.equals(refSless2_2);
result = result && refSless2_2.equals(refSless2_1);
@@ -691,13 +691,13 @@
result = result && (! refSless2_2.equals(sfulBusiness));
result = result && (! refSless2_2.equals(sfulRemote));
result = result && (! refSless2_2.equals(sfulRemoteHome));
-
+
return result;
}
-
+
public boolean checkSfulLocalReferences() {
boolean result = (refSful_1 != null);
-
+
result = result && (refSful_1.equals(refSful_1));
result = result && (! refSful_1.equals(refSful_2));
result = result && (! refSful_1.equals(refSful2_1));
@@ -709,7 +709,7 @@
result = result && (! refSful_1.equals(sfulRemote));
result = result && (! refSful_1.equals(sfulRemoteHome));
result = result && (! refSful_1.equals(new Object()));
-
+
result = result && (refSful_2 != null);
result = result && (! refSful_2.equals(refSful_1));
result = result && (refSful_2.equals(refSful_2));
@@ -722,7 +722,7 @@
result = result && (! refSful_2.equals(sfulRemote));
result = result && (! refSful_2.equals(sfulRemoteHome));
result = result && (! refSful_2.equals(new Object()));
-
+
result = result && (refSful2_1 != null);
result = result && (refSful2_1.equals(refSful2_1));
result = result && (! refSful2_1.equals(refSful2_2));
@@ -735,7 +735,7 @@
result = result && (! refSful2_1.equals(sfulRemote));
result = result && (! refSful2_1.equals(sfulRemoteHome));
result = result && (! refSful2_1.equals(new Object()));
-
+
result = result && (refSful2_2 != null);
result = result && (refSful2_2.equals(refSful2_2));
result = result && (! refSful2_2.equals(refSful2_1));
@@ -750,10 +750,10 @@
result = result && (! refSful2_2.equals(new Object()));
return result;
}
-
+
public boolean checkSlessRemoteReferences() {
boolean result = (refRemoteSless_1 != null);
-
+
result = result && (refRemoteSless_1.equals(refRemoteSless_1));
result = result && (refRemoteSless_1.equals(refRemoteSless_2));
result = result && (! refRemoteSless_1.equals(refRemoteSless2_1));
@@ -765,7 +765,7 @@
result = result && (! refRemoteSless_1.equals(sfulRemote));
result = result && (! refRemoteSless_1.equals(sfulRemoteHome));
result = result && (! refRemoteSless_1.equals(new Object()));
-
+
result = result && (refRemoteSless_2 != null);
result = result && (refRemoteSless_2.equals(refRemoteSless_1));
result = result && (refRemoteSless_2.equals(refRemoteSless_2));
@@ -778,7 +778,7 @@
result = result && (! refRemoteSless_2.equals(sfulRemote));
result = result && (! refRemoteSless_2.equals(sfulRemoteHome));
result = result && (! refRemoteSless_2.equals(new Object()));
-
+
result = result && (refRemoteSless2_1 != null);
result = result && (refRemoteSless2_1.equals(refRemoteSless2_1));
result = result && (refRemoteSless2_1.equals(refRemoteSless2_2));
@@ -791,7 +791,7 @@
result = result && (! refRemoteSless2_1.equals(sfulRemote));
result = result && (! refRemoteSless2_1.equals(sfulRemoteHome));
result = result && (! refRemoteSless2_1.equals(new Object()));
-
+
result = result && (refRemoteSless2_2 != null);
result = result && (refRemoteSless2_2.equals(refRemoteSless2_2));
result = result && (refRemoteSless2_2.equals(refRemoteSless2_1));
@@ -806,10 +806,10 @@
result = result && (! refRemoteSless2_2.equals(new Object()));
return result;
}
-
+
public boolean checkSfulRemoteReferences() {
boolean result = (refRemoteSful_1 != null);
-
+
result = result && (refRemoteSful_1.equals(refRemoteSful_1));
result = result && (! refRemoteSful_1.equals(refRemoteSful_2));
result = result && (! refRemoteSful_1.equals(refRemoteSful2_1));
@@ -821,7 +821,7 @@
result = result && (! refRemoteSful_1.equals(sfulRemote));
result = result && (! refRemoteSful_1.equals(sfulRemoteHome));
result = result && (! refRemoteSful_1.equals(new Object()));
-
+
result = result && (refRemoteSful_2 != null);
result = result && (! refRemoteSful_2.equals(refRemoteSful_1));
result = result && (refRemoteSful_2.equals(refRemoteSful_2));
@@ -834,7 +834,7 @@
result = result && (! refRemoteSful_2.equals(sfulRemote));
result = result && (! refRemoteSful_2.equals(sfulRemoteHome));
result = result && (! refRemoteSful_2.equals(new Object()));
-
+
result = result && (refRemoteSful2_1 != null);
result = result && (refRemoteSful2_1.equals(refRemoteSful2_1));
result = result && (! refRemoteSful2_1.equals(refRemoteSful2_2));
@@ -847,7 +847,7 @@
result = result && (! refRemoteSful2_1.equals(sfulRemote));
result = result && (! refRemoteSful2_1.equals(sfulRemoteHome));
result = result && (! refRemoteSful2_1.equals(new Object()));
-
+
result = result && (refRemoteSful2_2 != null);
result = result && (refRemoteSful2_2.equals(refRemoteSful2_2));
result = result && (! refRemoteSful2_2.equals(refRemoteSful2_1));
@@ -862,19 +862,19 @@
result = result && (! refRemoteSful2_2.equals(new Object()));
return result;
}
-
+
public DummyRemote getSfulRemoteBusiness(int num) {
return (num == 1)
? refRemoteSful_1 : refRemoteSful_2;
}
-
+
public DummyRemote2 getSfulRemoteBusiness2(int num) {
return (num == 1)
? refRemoteSful2_1 : refRemoteSful2_2;
}
-
+
public boolean compareRemoteRefs(Object ref1, Object ref2) {
return ref1.equals(ref2);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulBusiness.java
index 5625a39..2481d9e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulBusiness.java
@@ -23,10 +23,10 @@
// so it's not a problem to define a method that happens to have the
// same signature as one of EJBLocalObject's methods. remove() is
// a likely name for a method that has @Remove behavior so it needs
- // to work.
+ // to work.
public void remove();
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception;
public SfulBusiness2 getSfulBusiness2();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java
index 0e03859..2cc1e32 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java
@@ -103,7 +103,7 @@
// Ignore input parameter. client will use resulting unset state to
// ensure correct mapping of @Init
- System.out.println("In SfulEJB::adaptedCreate1(int ignore) method. "
+ System.out.println("In SfulEJB::adaptedCreate1(int ignore) method. "
+ "**ignoring** state=" + state);
System.out.println("Caller principal = " + ctx.getCallerPrincipal());
@@ -113,7 +113,7 @@
@Init("createFoo")
public void adaptedCreate2(int argument1) {
state = argument1;
- System.out.println("In SfulEJB::adaptedCreate2(int arg) method "
+ System.out.println("In SfulEJB::adaptedCreate2(int arg) method "
+ "state=" + state);
System.out.println("Caller principal = " + ctx.getCallerPrincipal());
@@ -154,7 +154,7 @@
public void remove() {}
@Remove(retainIfException=true)
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception {
if( throwException ) {
throw new Exception("exception from retainIfException. " +
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java
index c1507c1..57d99be 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java
@@ -20,7 +20,7 @@
public interface SfulRemote extends CommonRemote, EJBObject
{
-
+
public int getState() throws java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteBusiness.java
index 3e69169..1acc78a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteBusiness.java
@@ -22,14 +22,14 @@
public interface SfulRemoteBusiness extends CommonRemote
{
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception;
// The remote business interface has no relationship to EJBObject
// so it's not a problem to define a method that happens to have the
// same signature as one of EJBObject's methods. remove() is
// a likely name for a method that has @Remove behavior so it needs
- // to work.
+ // to work.
public void remove() throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java
index 6c25145..7ed2b77 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java
@@ -70,7 +70,7 @@
/**
* Business method declared on a super interface extended by both
* remote and local business interface. Test that tx attribute is
- * set appropriately for local vs. remote.
+ * set appropriately for local vs. remote.
*/
public void sharedRemoteLocalBusinessSuper(boolean expectTx) {
@@ -78,10 +78,10 @@
try {
- // Proprietary way to look up tx manager.
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
- // TODO check this, it worked inV2 new InitialContext().lookup("java:pm/TransactionManager");
- new InitialContext().lookup("java:appserver/TransactionManager");
+ // TODO check this, it worked inV2 new InitialContext().lookup("java:pm/TransactionManager");
+ new InitialContext().lookup("java:appserver/TransactionManager");
// Use an implementation-specific check whether there is a tx.
// A portable application couldn't make this check
@@ -93,13 +93,13 @@
} catch(Exception e) {
throw new EJBException(e);
}
-
+
if( expectTx && hasTx ) {
System.out.println("Successfully verified tx");
} else if( !expectTx && !hasTx ) {
System.out.println("Successfully verified there is no tx");
} else {
- throw new EJBException("Invalid tx status. ExpectTx = " +
+ throw new EJBException("Invalid tx status. ExpectTx = " +
expectTx + " hasTx = " + hasTx);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteBusiness2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteBusiness2.java
index 14813f5..1c3e97a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteBusiness2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteBusiness2.java
@@ -21,6 +21,6 @@
public interface SlessRemoteBusiness2 extends CommonRemoteLocalBusinessSuper
{
public void foo();
-
+
public void bar();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/build.xml
index 29392e8..f6230cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/build.xml
@@ -60,9 +60,9 @@
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb30-clientview tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb30-clientview tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.properties
index dfbaefd..0d8fc3d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-clientview-core"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="se.client" value="com.sun.s1asdev.ejb.ejb30.clientview.core.client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.xml
index 16e9901..32ef0a9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Common*.class,**/Helper*.class,**/Hello*.class,**/Bmp*.class,**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Helper*.class,**/SfulRemote.class,**/SlessRemote.class,**/Client.class,**/Hello.class,**/CommonRemote*.class,**/BmpRemote.class,**/BmpRemoteHome*.class,**/SfulRemoteHome*.class,**/SlessRemoteHome*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,17 +63,17 @@
</target>
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java
index 414604d..03eebba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java
@@ -26,12 +26,12 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@EJB private static Hello hr;
@EJB private static BmpRemoteHome bmpRemoteHome;
-
+
private static SfulRemoteHome sfulRemoteHome;
@EJB public static void setStatefulRemoteHome(SfulRemoteHome srh) {
@@ -40,7 +40,7 @@
private static SlessRemoteHome slessRemoteHome;
- @EJB(beanName="SlessBean")
+ @EJB(beanName="SlessBean")
private static void setStatelessRemoteHome(SlessRemoteHome srh) {
slessRemoteHome = srh;
}
@@ -51,25 +51,25 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-clientview-coreID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
- if( hr == null ) {
+ if( hr == null ) {
- System.out.println("In stand-alone mode");
- InitialContext ic = new InitialContext();
- hr = (Hello) ic.lookup("ejb/ejb_ejb30_clientview_core_CoreApp");
- bmpRemoteHome = (BmpRemoteHome) ic.lookup("ejb/ejb_ejb30_clientview_core_Bmp");
- sfulRemoteHome = (SfulRemoteHome) ic.lookup("ejb/ejb_ejb30_clientview_core_Sful");
- slessRemoteHome = (SlessRemoteHome) ic.lookup("ejb/ejb_ejb30_clientview_core_Sless");
+ System.out.println("In stand-alone mode");
+ InitialContext ic = new InitialContext();
+ hr = (Hello) ic.lookup("ejb/ejb_ejb30_clientview_core_CoreApp");
+ bmpRemoteHome = (BmpRemoteHome) ic.lookup("ejb/ejb_ejb30_clientview_core_Bmp");
+ sfulRemoteHome = (SfulRemoteHome) ic.lookup("ejb/ejb_ejb30_clientview_core_Sful");
+ slessRemoteHome = (SlessRemoteHome) ic.lookup("ejb/ejb_ejb30_clientview_core_Sless");
- }
+ }
System.out.println("testing injected BmpRemoteHome");
@@ -77,8 +77,8 @@
bmpRemote = bmpRemoteHome.findByPrimaryKey("client1");
EJBMetaData md = bmpRemoteHome.getEJBMetaData();
- System.out.println("metadata = " + md);
-
+ System.out.println("metadata = " + md);
+
System.out.println("testing injected SlessRemoteHome");
SlessRemote slessRemote = slessRemoteHome.create();
slessRemote.required();
@@ -86,12 +86,12 @@
System.out.println("testing injected SfulRemoteHome");
SfulRemote sfulRemote = sfulRemoteHome.createSful();
sfulRemote.required();
-
+
System.out.println("testing Remote 3.0 Hello intf");
hr.testPassByRef();
- // invoke method on the EJB
- doProxyTest(hr);
+ // invoke method on the EJB
+ doProxyTest(hr);
testExceptions(hr);
@@ -103,8 +103,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
private void testExceptions(Hello h) throws Exception {
@@ -113,7 +113,7 @@
h.throwException();
} catch(Exception e) {
if( e.getClass() == Exception.class ) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
} else {
throw e;
@@ -124,7 +124,7 @@
h.throwAppException1();
throw new Exception("didn't get exception for testException2");
} catch(jakarta.ejb.FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -132,7 +132,7 @@
h.throwAppException2();
throw new Exception("didn't get exception for testException3");
} catch(jakarta.ejb.FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -158,36 +158,36 @@
}
}
- private void doProxyTest(Hello hr)
- throws Exception
+ private void doProxyTest(Hello hr)
+ throws Exception
{
- System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
- hr.warmup(Common.STATEFUL);
- runTests(Common.STATEFUL, hr);
+ System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
+ hr.warmup(Common.STATEFUL);
+ runTests(Common.STATEFUL, hr);
- System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
- hr.warmup(Common.STATEFUL);
- runTests(Common.STATELESS, hr);
+ System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
+ hr.warmup(Common.STATEFUL);
+ runTests(Common.STATELESS, hr);
- System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
- hr.warmup(Common.BMP);
- runTests(Common.BMP, hr);
+ System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
+ hr.warmup(Common.BMP);
+ runTests(Common.BMP, hr);
}
private void runTests(int type, Hello hr)
- throws Exception
+ throws Exception
{
-
+
hr.notSupported(type, true);
hr.notSupported(type, false);
hr.supports(type, true);
- hr.supports(type, false);
+ hr.supports(type, false);
hr.required(type, true);
- hr.required(type, false);
+ hr.required(type, false);
hr.requiresNew(type, true);
- hr.requiresNew(type, false);
+ hr.requiresNew(type, false);
hr.mandatory(type, true);
- hr.never(type, false);
+ hr.never(type, false);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/descriptor/ejb-jar.xml
index e102171..0ac2b13 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/descriptor/ejb-jar.xml
@@ -48,7 +48,7 @@
</session>
<session>
<ejb-name>SfulBean</ejb-name>
- <home>com.sun.s1asdev.ejb.ejb30.clientview.core.SfulRemoteHome</home>
+ <home>com.sun.s1asdev.ejb.ejb30.clientview.core.SfulRemoteHome</home>
<remote>com.sun.s1asdev.ejb.ejb30.clientview.core.SfulRemote</remote>
<local-home>com.sun.s1asdev.ejb.ejb30.clientview.core.SfulHome</local-home>
<local>com.sun.s1asdev.ejb.ejb30.clientview.core.Sful</local>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java
index db989ed..4fa7433 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java
@@ -27,7 +27,7 @@
public String ejbCreate(String s) {
System.out.println("ec_ == " + ec_);
- return s;
+ return s;
}
public void ejbPostCreate(String s) {}
@@ -47,10 +47,10 @@
public void unsetEntityContext()
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -63,7 +63,7 @@
{}
public String ejbFindByPrimaryKey(String s) {
- return s;
+ return s;
}
public void testException1() throws Exception {
@@ -101,7 +101,7 @@
}
public void testPassByRef4(CommonRemote cr) {
-
+
}
public Helper1 testPassByRef5() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java
index 244fe3e..9a36517 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java
@@ -21,5 +21,5 @@
public interface BmpHome extends BmpHomeSuper
{
- Bmp findByPrimaryKey(String s) throws CreateException;
+ Bmp findByPrimaryKey(String s) throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java
index a9c4baa..a49991a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java
@@ -21,5 +21,5 @@
public interface BmpRemoteHome extends BmpRemoteHomeSuper
{
- BmpRemote findByPrimaryKey(String s) throws RemoteException, CreateException;
+ BmpRemote findByPrimaryKey(String s) throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java
index 7bf7814..2d204f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java
@@ -53,7 +53,7 @@
@EJB public BmpHome bmpHome;
- @EJB(beanName="BmpBean")
+ @EJB(beanName="BmpBean")
public BmpHomeSuper bmpHomeSuper;
private Bmp bmp;
@@ -62,7 +62,7 @@
private BmpRemote bmpRemote;
private long overhead;
-
+
private static final String pkey = "A BMP Bean";
@Resource jakarta.transaction.UserTransaction ut;
@@ -70,27 +70,27 @@
@PostConstruct
public void create() {
- try {
+ try {
sful = sfulHome.createSful();
sfulRemote = sfulRemoteHome.createSful();
- System.out.println("Created loca/remote sful objs via homes.");
+ System.out.println("Created loca/remote sful objs via homes.");
bmp = bmpHome.create(pkey);
bmpRemote = (BmpRemote)
bmpRemoteHome.findByPrimaryKey(pkey);
- System.out.println("Created BMP bean.");
+ System.out.println("Created BMP bean.");
sless = slessHome.create();
slessRemote = slessRemoteHome.create();
- System.out.println("Created loca/remote sless objs via homes.");
+ System.out.println("Created loca/remote sless objs via homes.");
// ut = context.getUserTransaction();
-
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
}
private void testRemove() throws RemoteException {
@@ -99,7 +99,7 @@
System.out.println("Created BMP bean.");
bmpHome.remove(bmp2.getPrimaryKey());
System.out.println("Successfully removed local entity bean");
- } catch(Exception e) {
+ } catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
@@ -127,9 +127,9 @@
try {
((EJBLocalObject)sful).remove();
-
+
try {
- ((EJBLocalObject)sful).remove();
+ ((EJBLocalObject)sful).remove();
throw new EJBException("2nd sful remove should have caused exception");
} catch(Exception e) {
System.out.println("Successfully caught exception when attempting to "+
@@ -139,7 +139,7 @@
((EJBLocalObject)sless).remove();
- ((EJBLocalObject)bmp).remove();
+ ((EJBLocalObject)bmp).remove();
} catch(Exception e) {
EJBException ejbEx = new EJBException();
@@ -160,52 +160,52 @@
public void throwAppException2() throws FinderException {
throw new ObjectNotFoundException("throwAppException2");
}
-
+
public void warmup(int type) {
try {
warmup(type, true);
warmup(type, false);
-
- // Measure looping and timing overhead
+
+ // Measure looping and timing overhead
long begin = System.currentTimeMillis();
for ( int i=0; i<ITERATIONS; i++ ) {
}
long end = System.currentTimeMillis();
overhead = end - begin;
-
+
String pkey2 = (String) ((EJBLocalObject)bmp).getPrimaryKey();
if( !pkey2.equals(pkey) ) {
throw new EJBException("pkey2 " + pkey2 + " doesn't match " + pkey);
}
-
+
ut = context.getUserTransaction();
-
+
testLocalObjects(((EJBLocalObject)sful), ((EJBLocalObject)sless));
testLocalObjects(((EJBLocalObject)sful), ((EJBLocalObject)bmp));
testLocalObjects(((EJBLocalObject)sless),((EJBLocalObject)bmp));
-
+
testEJBObjects(sfulRemote, slessRemote);
testEJBObjects(sfulRemote, bmpRemote);
testEJBObjects(slessRemote, bmpRemote);
-
+
testNotImplemented(sful);
testNotImplemented(sless);
testNotImplemented(bmp);
-
+
testNotImplemented(sfulRemote);
testNotImplemented(slessRemote);
testNotImplemented(bmpRemote);
-
+
testRemove();
-
+
// skip testExceptions for sfsb since throwing a runtime exception
// will cause the bean to be removed
// testExceptions(sful);
-
+
testExceptions(sless);
testExceptions(bmp);
-
+
testExceptions(slessRemote);
testExceptions(bmpRemote);
} catch(Exception e) {
@@ -213,14 +213,14 @@
throw new EJBException(e);
}
}
-
+
private void testExceptions(Common c) {
try {
c.testException1();
throw new EJBException("didn't get exception for testException1");
} catch(Exception e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -228,7 +228,7 @@
c.testException2();
throw new EJBException("didn't get exception for testException2");
} catch(EJBException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -236,10 +236,10 @@
c.testException3();
throw new EJBException("didn't get exception for testException3");
} catch(FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
-
+
}
private void testExceptions(CommonRemote c) throws RemoteException {
@@ -248,7 +248,7 @@
c.testException1();
throw new EJBException("didn't get exception for testException1");
} catch(Exception e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -256,7 +256,7 @@
c.testException2();
throw new EJBException("didn't get exception for testException2");
} catch(RemoteException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -264,7 +264,7 @@
c.testException3();
throw new EJBException("didn't get exception for testException3");
} catch(FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -272,10 +272,10 @@
c.testException4();
throw new EJBException("didn't get exception for testException4");
} catch(FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
-
+
}
public Object testPassByRef() {
@@ -283,15 +283,15 @@
System.out.println("Doing pass by ref tests for slessRemote " +
", passbyref = true");
_testPassByRef(slessRemote, true);
-
+
System.out.println("Doing pass by ref tests for sfulRemote " +
", passbyref = false");
_testPassByRef(sfulRemote, false);
-
+
System.out.println("Doing pass by ref tests for bmpRemote " +
", passbyref = false");
_testPassByRef(bmpRemote, false);
-
+
// uncomment to see exception that is thrown when non-serializable
// object is passed over non-collocated remote call
//return new Helper2();
@@ -303,9 +303,9 @@
return null;
}
- private void _testPassByRef(CommonRemote c, boolean passByRef)
+ private void _testPassByRef(CommonRemote c, boolean passByRef)
throws Exception {
-
+
int intVal = 1;
String stringVal = "HelloEJB::_testPassByRef";
@@ -321,7 +321,7 @@
if( passByRef ) {
if( (h1.a == intVal) || h1.b.equals(stringVal) ) {
throw new EJBException("h1 mutations not present " + h1);
- }
+ }
} else {
if( (h1.a != intVal) || !h1.b.equals(stringVal) ) {
throw new EJBException("error : h1 was mutated " + h1);
@@ -338,23 +338,23 @@
System.out.println("After testPassByRef3 : " + h2);
if( (h2.a == intVal) || h2.b.equals(stringVal) ) {
throw new EJBException("h2 mutations not present " + h2);
- }
+ }
} else {
try {
c.testPassByRef3(h2);
- System.out.println("Error : Expected exception when " +
+ System.out.println("Error : Expected exception when " +
"passing non-serializable data " + h2);
-
+
/* DON'T TREAT AS FATAL ERROR WHILE WE INVESTIGATE WHETHER
* THIS WAS INTENDED BEHAVIOR FOR THE ORB
- throw new EJBException("Error : Expected exception when " +
- "passing non-serializable data " +
+ throw new EJBException("Error : Expected exception when " +
+ "passing non-serializable data " +
h2);
*/
} catch(EJBException ejbex) {
throw ejbex;
} catch(Exception e) {
- System.out.println("Caught expected exception when " +
+ System.out.println("Caught expected exception when " +
" passing non-serializable data" +
e.toString());
}
@@ -369,16 +369,16 @@
} else {
try {
Helper2 h6 = c.testPassByRef6();
- System.out.println("Error : Expected exception when " +
+ System.out.println("Error : Expected exception when " +
"returning non-serializable data " + h6);
- /* see comment for testPassByRef3 above
- throw new EJBException("Error : Expected exception when " +
+ /* see comment for testPassByRef3 above
+ throw new EJBException("Error : Expected exception when " +
"returning non-serializable data ");
*/
} catch(EJBException ejbex) {
- throw ejbex;
+ throw ejbex;
} catch(Exception e) {
- System.out.println("Caught expected exception when " +
+ System.out.println("Caught expected exception when " +
" returning non-serializable data" +
e.toString());
}
@@ -410,52 +410,52 @@
}
private void warmup(int type, boolean tx) {
- // get Hotspot warmed up
- Common bean = pre(type, tx);
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- bean.notSupported();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- if ( tx )
- bean.mandatory();
- else
- bean.never();
- bean.supports();
- }
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
+ // get Hotspot warmed up
+ Common bean = pre(type, tx);
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ bean.notSupported();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ if ( tx )
+ bean.mandatory();
+ else
+ bean.never();
+ bean.supports();
+ }
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
}
- private Common pre(int type, boolean tx)
+ private Common pre(int type, boolean tx)
{
- if ( tx ) try { ut.begin(); } catch ( Exception ex ) {}
- if ( type == Common.STATELESS )
- return sless;
- else if ( type == Common.STATEFUL )
- return sful;
- else
- return bmp;
+ if ( tx ) try { ut.begin(); } catch ( Exception ex ) {}
+ if ( type == Common.STATELESS )
+ return sless;
+ else if ( type == Common.STATEFUL )
+ return sful;
+ else
+ return bmp;
}
- private CommonRemote preRemote(int type, boolean tx)
- {
- if ( type == Common.STATELESS )
- return slessRemote;
- else if ( type == Common.STATEFUL )
- return sfulRemote;
- else
- return bmpRemote;
+ private CommonRemote preRemote(int type, boolean tx)
+ {
+ if ( type == Common.STATELESS )
+ return slessRemote;
+ else if ( type == Common.STATEFUL )
+ return sfulRemote;
+ else
+ return bmpRemote;
}
private float post(long begin, long end, boolean tx)
{
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
- return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
+ return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
}
- public float requiresNew(int type, boolean tx)
+ public float requiresNew(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -477,7 +477,7 @@
return post(begin, end, tx);
}
- public float notSupported(int type, boolean tx)
+ public float notSupported(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -495,11 +495,11 @@
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
- }
- return post(begin, end, tx);
+ }
+ return post(begin, end, tx);
}
- public float required(int type, boolean tx)
+ public float required(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -513,23 +513,23 @@
for ( int i=0; i<ITERATIONS; i++ ) {
beanRemote.required();
}
-
+
end = System.currentTimeMillis();
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
- public float mandatory(int type, boolean tx)
+ public float mandatory(int type, boolean tx)
{
long begin = 0;
long end = 0;
try {
Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- begin = System.currentTimeMillis();
+ begin = System.currentTimeMillis();
for ( int i=0; i<ITERATIONS; i++ ) {
bean.mandatory();
}
@@ -541,7 +541,7 @@
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
public float never(int type, boolean tx)
@@ -563,10 +563,10 @@
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
- public float supports(int type, boolean tx)
+ public float supports(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -585,7 +585,7 @@
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
// assumes lo1 and lo2 are do not have same client identity
@@ -629,11 +629,11 @@
if( o1.isIdentical(o2) ) {
throw new EJBException("isIdentical failed");
}
-
+
if( o2.isIdentical(o1) ) {
throw new EJBException("isIdentical failed");
}
-
+
if( !o1.isIdentical(o1) ) {
throw new EJBException("isIdentical failed");
}
@@ -686,12 +686,12 @@
}
System.out.println("o1.hashCode() = " + o1.hashCode());
-
+
System.out.println("o2.hashCode() = " + o2.hashCode());
-
+
System.out.println("o1.toString() = " + o1.toString());
System.out.println("o2.toString() = " + o2.toString());
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java
index 1520c06..3129c97 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java
@@ -50,15 +50,15 @@
}
@PreDestroy
- public void ejbRemove()
- {
+ public void ejbRemove()
+ {
System.out.println("In SfulEJB.ejbRemove(). about to throw exception");
throw new RuntimeException("test cleanup for case where " +
"ejbRemove throws an exception");
}
@PrePassivate
- public void ejbActivate()
+ public void ejbActivate()
{}
@PostActivate
@@ -115,7 +115,7 @@
Helper2 h2 = new Helper2();
h2.a = 1;
h2.b = "SfulEJB::testPassByRef6";
- return h2;
+ return h2;
}
public CommonRemote testPassByRef7() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java
index 303abf5..3fafce3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java
@@ -40,10 +40,10 @@
sc_ = sc;
}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -70,7 +70,7 @@
}
public void testPassByRef1(int a) {
-
+
}
public void testPassByRef2(Helper1 helper1) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.properties
index 8487956..0aec84c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-clientview-exceptions"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="se.client" value="com.sun.s1asdev.ejb.ejb30.clientview.exceptions.client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.xml
index 06abb53..5bbad02 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello*.class,**/Sful*.class,**/Sless*.class,**/*Exception.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/Hello.class,**/S*Business*.class,**/*Exception.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,17 +63,17 @@
</target>
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java
index 8cd7114..6eb7101 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java
@@ -27,12 +27,12 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@EJB static private Hello hr;
- @EJB static protected SlessRemoteBusiness2 slessRemoteBusiness2;
+ @EJB static protected SlessRemoteBusiness2 slessRemoteBusiness2;
@EJB static public SfulRemoteBusiness2 sfulRemoteBusiness2;
@EJB static public SlessRemoteBusiness slessRemoteBusiness;
@@ -44,28 +44,28 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-clientview-exceptionsID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
- if( hr == null ) {
+ if( hr == null ) {
- System.out.println("In stand-alone mode");
- InitialContext ic = new InitialContext();
- hr = (Hello) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Hello");
- sfulRemoteBusiness2 = (SfulRemoteBusiness2) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sful#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SfulRemoteBusiness2");
- slessRemoteBusiness2 = (SlessRemoteBusiness2) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sless#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SlessRemoteBusiness2");
- sfulRemoteBusiness = (SfulRemoteBusiness) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sful#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SfulRemoteBusiness");
- slessRemoteBusiness = (SlessRemoteBusiness) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sless#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SlessRemoteBusiness");
+ System.out.println("In stand-alone mode");
+ InitialContext ic = new InitialContext();
+ hr = (Hello) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Hello");
+ sfulRemoteBusiness2 = (SfulRemoteBusiness2) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sful#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SfulRemoteBusiness2");
+ slessRemoteBusiness2 = (SlessRemoteBusiness2) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sless#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SlessRemoteBusiness2");
+ sfulRemoteBusiness = (SfulRemoteBusiness) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sful#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SfulRemoteBusiness");
+ slessRemoteBusiness = (SlessRemoteBusiness) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sless#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SlessRemoteBusiness");
- }
+ }
- // TODO enable when hr.runAccessDeniedExceptionTest();
+ // TODO enable when hr.runAccessDeniedExceptionTest();
hr.runTxRequiredTest();
@@ -88,7 +88,7 @@
runConcurrentAccessTest();
- return;
+ return;
}
private void runTxRequiredTest() {
@@ -99,30 +99,30 @@
sfulRemoteBusiness.forceTransactionRequiredException();
} catch(EJBTransactionRequiredException txre) {
numEx++;
- }
-
+ }
+
try {
slessRemoteBusiness.forceTransactionRequiredException();
} catch(EJBTransactionRequiredException txre) {
- numEx++;
- }
+ numEx++;
+ }
try {
sfulRemoteBusiness2.forceTransactionRequiredException();
} catch(TransactionRequiredException txre) {
numEx++;
} catch(RemoteException e) {}
-
+
try {
slessRemoteBusiness2.forceTransactionRequiredException();
} catch(TransactionRequiredException txre) {
numEx++;
} catch(RemoteException e) {}
-
+
if( numEx != 4 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runTxRequiredTest");
}
@@ -131,75 +131,75 @@
}
public void runConcurrentAccessTest() {
- try {
- MyThread thread = new MyThread(sfulRemoteBusiness);
- thread.start();
+ try {
+ MyThread thread = new MyThread(sfulRemoteBusiness);
+ thread.start();
- sleepFor(5);
- sfulRemoteBusiness.ping();
- stat.addStatus("local concurrentAccess[1.1]", stat.FAIL);
- } catch (jakarta.ejb.ConcurrentAccessException conEx) {
- stat.addStatus("local concurrentAccess[1.1]", stat.PASS);
- } catch (Throwable th) {
- System.out.println("Argggggg: Got: " + th);
- stat.addStatus("local concurrentAccess[1.2]", stat.FAIL);
- }
+ sleepFor(5);
+ sfulRemoteBusiness.ping();
+ stat.addStatus("local concurrentAccess[1.1]", stat.FAIL);
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
+ stat.addStatus("local concurrentAccess[1.1]", stat.PASS);
+ } catch (Throwable th) {
+ System.out.println("Argggggg: Got: " + th);
+ stat.addStatus("local concurrentAccess[1.2]", stat.FAIL);
+ }
- try {
- MyThread2 thread = new MyThread2(sfulRemoteBusiness2);
- thread.start();
+ try {
+ MyThread2 thread = new MyThread2(sfulRemoteBusiness2);
+ thread.start();
- sleepFor(5);
- sfulRemoteBusiness2.pingRemote();
- stat.addStatus("local concurrentAccess[2.1]", stat.FAIL);
- } catch (java.rmi.RemoteException remEx) {
- stat.addStatus("local concurrentAccess[2.1]", stat.PASS);
- } catch (Throwable th) {
- stat.addStatus("local concurrentAccess[2.2] Got: " + th, stat.FAIL);
- }
+ sleepFor(5);
+ sfulRemoteBusiness2.pingRemote();
+ stat.addStatus("local concurrentAccess[2.1]", stat.FAIL);
+ } catch (java.rmi.RemoteException remEx) {
+ stat.addStatus("local concurrentAccess[2.1]", stat.PASS);
+ } catch (Throwable th) {
+ stat.addStatus("local concurrentAccess[2.2] Got: " + th, stat.FAIL);
+ }
}
class MyThread extends Thread {
- SfulRemoteBusiness sfulBusiness;
+ SfulRemoteBusiness sfulBusiness;
- MyThread(SfulRemoteBusiness sfulBusiness) {
- this.sfulBusiness = sfulBusiness;
- }
+ MyThread(SfulRemoteBusiness sfulBusiness) {
+ this.sfulBusiness = sfulBusiness;
+ }
- public void run() {
- try {
- sfulBusiness.sleepFor(20);
- } catch (Throwable th) {
- throw new RuntimeException("Could not invoke waitfor() method");
- }
- }
+ public void run() {
+ try {
+ sfulBusiness.sleepFor(20);
+ } catch (Throwable th) {
+ throw new RuntimeException("Could not invoke waitfor() method");
+ }
+ }
}
class MyThread2 extends Thread {
- SfulRemoteBusiness2 sfulBusiness2;
+ SfulRemoteBusiness2 sfulBusiness2;
- MyThread2(SfulRemoteBusiness2 sfulBusiness2) {
- this.sfulBusiness2 = sfulBusiness2;
- }
+ MyThread2(SfulRemoteBusiness2 sfulBusiness2) {
+ this.sfulBusiness2 = sfulBusiness2;
+ }
- public void run() {
- try {
- sfulBusiness2.sleepFor(20);
- } catch (Throwable th) {
- throw new RuntimeException("Could not invoke waitfor() method");
- }
- }
+ public void run() {
+ try {
+ sfulBusiness2.sleepFor(20);
+ } catch (Throwable th) {
+ throw new RuntimeException("Could not invoke waitfor() method");
+ }
+ }
}
private void sleepFor(int sec) {
- try {
- for (int i=0 ; i<sec; i++) {
- Thread.currentThread().sleep(1000);
- System.out.println("[" + i + "/" + sec + "]: Sleeping....");
- }
- } catch (Exception ex) {
- }
+ try {
+ for (int i=0 ; i<sec; i++) {
+ Thread.currentThread().sleep(1000);
+ System.out.println("[" + i + "/" + sec + "]: Sleeping....");
+ }
+ } catch (Exception ex) {
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/descriptor/sun-ejb-jar.xml
index 7531b55..e9cb4b9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/descriptor/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<jndi-name>ejb/ejb_ejb30_clientview_exceptions_Hello</jndi-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>1</resize-quantity>
+ <resize-quantity>1</resize-quantity>
<cache-idle-timeout-in-seconds>5</cache-idle-timeout-in-seconds>
</bean-cache>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java
index 3707d3a..0c6c9f1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java
@@ -46,7 +46,7 @@
@EJB(name="sfulBusiness") public SfulBusiness sfulBusiness;
@EJB(name="slessBusiness") public SlessBusiness slessBusiness;
- @EJB(name="slessRemoteBusiness2") protected SlessRemoteBusiness2 slessRemoteBusiness2;
+ @EJB(name="slessRemoteBusiness2") protected SlessRemoteBusiness2 slessRemoteBusiness2;
@EJB(name="sfulRemoteBusiness2") public SfulRemoteBusiness2 sfulRemoteBusiness2;
@EJB public SlessRemoteBusiness slessRemoteBusiness;
@@ -57,12 +57,12 @@
@PostConstruct
public void create() {
- try {
+ try {
ut = context.getUserTransaction();
-
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
}
private void setup() {
@@ -74,10 +74,10 @@
sfulRemoteBusiness = (SfulRemoteBusiness) context.lookup("com.sun.s1asdev.ejb.ejb30.clientview.exceptions.HelloEJB/sfulRemoteBusiness");
slessRemoteBusiness = (SlessRemoteBusiness) context.lookup("com.sun.s1asdev.ejb.ejb30.clientview.exceptions.HelloEJB/slessRemoteBusiness");
-
+
sfulRemoteBusiness2 = (SfulRemoteBusiness2) context.lookup("sfulRemoteBusiness2");
slessRemoteBusiness2 = (SlessRemoteBusiness2) context.lookup("slessRemoteBusiness2");
-
+
} catch(Exception e) {
e.printStackTrace();
}
@@ -94,13 +94,13 @@
} catch(EJBAccessException eae) {
// this might be thrown by container but application
// can't depend on receiving the sub-class exception
- System.out.println("Got specific ejb30 exception " +
+ System.out.println("Got specific ejb30 exception " +
eae + " for sfulBusiness.denied()");
// bean must still exist
sfulBusiness.foo();
numEx++;
} catch(EJBException ele) {
- System.out.println("Got valid exception " +
+ System.out.println("Got valid exception " +
ele + " for sfulBusiness.denied()");
// bean must still exist
sfulBusiness.foo();
@@ -110,7 +110,7 @@
try {
sfulRemoteBusiness.denied();
} catch(EJBException re) {
- System.out.println("Got expected exception " +
+ System.out.println("Got expected exception " +
re + " for sfulRemoteBusiness.denied()");
// bean must still exist
@@ -121,7 +121,7 @@
try {
sfulRemoteBusiness2.denied();
} catch(RemoteException re) {
- System.out.println("Got expected exception " +
+ System.out.println("Got expected exception " +
re + " for sfulBusiness2.denied()");
// bean must still exist
@@ -132,7 +132,7 @@
try {
slessBusiness.denied();
} catch(EJBException ele) {
- System.out.println("Got expected exception " +
+ System.out.println("Got expected exception " +
ele + " for slessBusiness.denied()");
numEx++;
@@ -141,7 +141,7 @@
try {
slessRemoteBusiness.denied();
} catch(EJBException re) {
- System.out.println("Got expected exception " +
+ System.out.println("Got expected exception " +
re + " for slessRemoteBusiness.denied()");
numEx++;
}
@@ -149,15 +149,15 @@
try {
slessRemoteBusiness2.denied();
} catch(RemoteException re) {
- System.out.println("Got expected exception " +
+ System.out.println("Got expected exception " +
re + " for slessRemoteBusiness2.denied()");
numEx++;
}
-
+
if( numEx != 6 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runAccessDeniedExceptionTest");
}
@@ -180,7 +180,7 @@
e.printStackTrace();
}
-
+
try {
ut.begin();
ut.setRollbackOnly();
@@ -189,7 +189,7 @@
try { ut.rollback(); } catch(Exception t) {}
numEx++;
} catch(Exception e) {}
-
+
try {
ut.begin();
ut.setRollbackOnly();
@@ -198,14 +198,14 @@
try { ut.rollback(); } catch(Exception t) {}
numEx++;
} catch(Exception e) {}
-
+
try {
ut.begin();
ut.setRollbackOnly();
slessRemoteBusiness.forceTransactionRolledbackException();
} catch(EJBTransactionRolledbackException txre) {
try { ut.rollback(); } catch(Exception t) {}
- numEx++;
+ numEx++;
} catch(Exception e) {}
try {
@@ -216,7 +216,7 @@
try { ut.rollback(); } catch(Exception t) {}
numEx++;
} catch(Exception e) {}
-
+
try {
ut.begin();
ut.setRollbackOnly();
@@ -225,17 +225,17 @@
try { ut.rollback(); } catch(Exception t) {}
numEx++;
} catch(Exception e) {}
-
+
if( numEx != 6 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runTxRolledbackTest");
}
}
-
+
public void runTxRequiredTest() {
setup();
@@ -246,42 +246,42 @@
sfulBusiness.forceTransactionRequiredException();
} catch(EJBTransactionRequiredException txre) {
numEx++;
- }
-
+ }
+
try {
slessBusiness.forceTransactionRequiredException();
} catch(EJBTransactionRequiredException txre) {
numEx++;
}
-
+
try {
sfulRemoteBusiness.forceTransactionRequiredException();
} catch(EJBTransactionRequiredException txre) {
numEx++;
- }
-
+ }
+
try {
slessRemoteBusiness.forceTransactionRequiredException();
} catch(EJBTransactionRequiredException txre) {
- numEx++;
- }
+ numEx++;
+ }
try {
sfulRemoteBusiness2.forceTransactionRequiredException();
} catch(TransactionRequiredException txre) {
numEx++;
} catch(RemoteException e) {}
-
+
try {
slessRemoteBusiness2.forceTransactionRequiredException();
} catch(TransactionRequiredException txre) {
numEx++;
} catch(RemoteException e) {}
-
+
if( numEx != 6 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runTxRequiredTest");
}
@@ -299,14 +299,14 @@
sfulBusiness.remove();
} catch(NoSuchEJBException nsee) {
numEx++;
- }
+ }
- sfulRemoteBusiness.remove();
+ sfulRemoteBusiness.remove();
try {
sfulRemoteBusiness.remove();
} catch(NoSuchEJBException nsee) {
numEx++;
- }
+ }
// sfulremotebusiness2
@@ -321,11 +321,11 @@
} catch(NoSuchObjectException nsoe) {
numEx++;
} catch(RemoteException e) {}
-
+
if( numEx != 3 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runNoSuchObjectTest");
}
@@ -349,14 +349,14 @@
} catch(RuntimeAppException b) {
numEx++;
}
- }
-
+ }
+
try {
slessBusiness.throwRuntimeAppException();
} catch(RuntimeAppException txre) {
numEx++;
}
-
+
try {
sfulRemoteBusiness.throwRuntimeAppException();
} catch(RuntimeAppException a) {
@@ -368,13 +368,13 @@
} catch(RuntimeAppException b) {
numEx++;
}
- }
-
+ }
+
try {
slessRemoteBusiness.throwRuntimeAppException();
} catch(RuntimeAppException txre) {
- numEx++;
- }
+ numEx++;
+ }
try {
sfulRemoteBusiness2.throwRuntimeAppException();
@@ -388,17 +388,17 @@
numEx++;
} catch(RemoteException re) {}
} catch(RemoteException e) {}
-
+
try {
slessRemoteBusiness2.throwRuntimeAppException();
} catch(RuntimeAppException txre) {
numEx++;
} catch(RemoteException e) {}
-
+
if( numEx != 6 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runAppExceptionTest");
}
@@ -459,8 +459,8 @@
try { ut.rollback(); } catch(Exception t) {}
}
-
- try {
+
+ try {
ut.begin();
sfulRemoteBusiness.throwRuntimeAppException();
} catch(RuntimeAppException a) {
@@ -470,7 +470,7 @@
} catch(Exception e) {
} finally {
try { ut.rollback(); } catch(Exception t) {}
- }
+ }
try {
ut.begin();
@@ -484,7 +484,7 @@
try { ut.rollback(); } catch(Exception t) {}
}
-
+
try {
ut.begin();
slessRemoteBusiness.throwRuntimeAppException();
@@ -495,7 +495,7 @@
} catch(Exception e) {
} finally {
try { ut.rollback(); } catch(Exception t) {}
- }
+ }
try {
ut.begin();
@@ -565,7 +565,7 @@
if( numEx != 12 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runRollbackAppExceptionTest");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java
index 38f6354..041a4d4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java
@@ -23,7 +23,7 @@
@Stateful
@AccessTimeout(0)
-public class SfulEJB implements
+public class SfulEJB implements
SfulBusiness, SfulRemoteBusiness, SfulRemoteBusiness2
{
int state = 0;
@@ -55,12 +55,12 @@
}
public void sleepFor(int sec) {
- try {
- for (int i=0 ; i<sec; i++) {
- Thread.currentThread().sleep(1000);
- }
- } catch (Exception ex) {
- }
+ try {
+ for (int i=0 ; i<sec; i++) {
+ Thread.currentThread().sleep(1000);
+ }
+ } catch (Exception ex) {
+ }
}
public void ping() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java
index 6c32446..3ecb280 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java
@@ -19,7 +19,7 @@
import jakarta.ejb.Remote;
@Remote
-public interface SfulRemoteBusiness
+public interface SfulRemoteBusiness
{
void foo();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessBusiness.java
index 9284a18..6a7a14a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessBusiness.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
-public interface SlessBusiness
+public interface SlessBusiness
{
void forceTransactionRequiredException();
@@ -26,6 +26,6 @@
void throwRuntimeAppException() throws RuntimeAppException;
void throwRollbackAppException() throws RollbackAppException;
-
+
void denied();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java
index 6dadb35..cdf90ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java
@@ -20,7 +20,7 @@
import jakarta.ejb.Remote;
@Remote
-public interface SlessRemoteBusiness
+public interface SlessRemoteBusiness
{
void forceTransactionRequiredException();
@@ -30,6 +30,6 @@
void throwRuntimeAppException() throws RuntimeAppException;
void throwRollbackAppException() throws RollbackAppException;
-
+
void denied();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.properties
index 99051f6..54a1ff9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-ee-local_sfsb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.ee.local_sfsb.client.StandaloneClient"/>
<property name="simple.client2" value="com.sun.s1asdev.ejb.ejb30.ee.local_sfsb.client.StandaloneClient2"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.xml
index 011dc8e..4351096 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/SfulDriver.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java
index 6e258c4..530265d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java
@@ -25,10 +25,10 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@EJB(name="ejb/SfulDriverRef", beanInterface=SfulDriver.class,
- mappedName="corbaname:iiop:localhost:3702#ejb/SfulDriverRef")
+ mappedName="corbaname:iiop:localhost:3702#ejb/SfulDriverRef")
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -38,52 +38,52 @@
lookupUsingJndi();
//client.doTest();
stat.printSummary("ejb-ejb30-ee-local_sfsbID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
@EJB(name="ejb/SfulDriver", beanInterface=SfulDriver.class)
private static SfulDriver driver;
public void doTest() {
- driver.initialize();
+ driver.initialize();
try {
System.out.println("invoking stateless");
String result = driver.sayHello();
stat.addStatus("local hello",
- "Hello".equals(result) ? stat.PASS : stat.FAIL);
+ "Hello".equals(result) ? stat.PASS : stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("local hello" , stat.FAIL);
}
- try {
+ try {
boolean result = driver.doRefAliasingTest();
stat.addStatus("local PRE_refAliasingTest",
- result ? stat.PASS : stat.FAIL);
+ result ? stat.PASS : stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("local refAliasingTest" , stat.FAIL);
}
- //driver.createManySfulEJBs(16);
- //createManySfulEJBs(16);
+ //driver.createManySfulEJBs(16);
+ //createManySfulEJBs(16);
- sleepFor(5);
- driver.checkGetRef();
-
- try {
+ sleepFor(5);
+ driver.checkGetRef();
+
+ try {
boolean result = driver.doRefAliasingTest();
stat.addStatus("local POST_refAliasingTest",
- result ? stat.PASS : stat.FAIL);
+ result ? stat.PASS : stat.FAIL);
- boolean greeterTest = driver.useSfulGreeter();
+ boolean greeterTest = driver.useSfulGreeter();
stat.addStatus("local GreeterRefTest",
- result ? stat.PASS : stat.FAIL);
+ result ? stat.PASS : stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
@@ -95,50 +95,50 @@
private static void sleepFor(int seconds) {
- while (seconds-- > 0) {
- try { Thread.sleep(1000); } catch (Exception ex) {}
- System.out.println("Sleeping for 1 second. Still " + seconds + " seconds left...");
- }
+ while (seconds-- > 0) {
+ try { Thread.sleep(1000); } catch (Exception ex) {}
+ System.out.println("Sleeping for 1 second. Still " + seconds + " seconds left...");
+ }
}
private static void createManySfulEJBs(int count) {
- while (count-- > 0) {
- try {
- SfulDriver dr = (SfulDriver) (new InitialContext()).lookup("java:comp/env/ejb/SfulDriver");
- dr.initialize();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
+ while (count-- > 0) {
+ try {
+ SfulDriver dr = (SfulDriver) (new InitialContext()).lookup("java:comp/env/ejb/SfulDriver");
+ dr.initialize();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
}
private static void lookupUsingJndi() {
- try {
+ try {
/*
- Properties props = new Properties();
- props.setProperty("java.naming.factory.initial", "com.sun.enterprise.naming.SerialInitContextFactory");
- props.setProperty("java.naming.factory.url.pkgs", "com.sun.enterprise.naming");
- props.setProperty("java.naming.factory.state", "com.sun.corba.ee.impl.presentation.rmi.JNDIStateFactoryImpl");
- props.setProperty("org.omg.CORBA.ORBInitialHost", "129.145.133.197");
- props.setProperty("org.omg.CORBA.ORBInitialPort", "3702");
+ Properties props = new Properties();
+ props.setProperty("java.naming.factory.initial", "com.sun.enterprise.naming.SerialInitContextFactory");
+ props.setProperty("java.naming.factory.url.pkgs", "com.sun.enterprise.naming");
+ props.setProperty("java.naming.factory.state", "com.sun.corba.ee.impl.presentation.rmi.JNDIStateFactoryImpl");
+ props.setProperty("org.omg.CORBA.ORBInitialHost", "129.145.133.197");
+ props.setProperty("org.omg.CORBA.ORBInitialPort", "3702");
- InitialContext ctx = new InitialContext(props);
+ InitialContext ctx = new InitialContext(props);
*/
- InitialContext ctx = new InitialContext();
- String name = "ejb/SfulDriverRef";
- name = "corbaname:iiop:129.145.133.197:3700#" + name;
+ InitialContext ctx = new InitialContext();
+ String name = "ejb/SfulDriverRef";
+ name = "corbaname:iiop:129.145.133.197:3700#" + name;
System.out.println("***Looking up SfulDriver...");
- SfulDriver driver = (SfulDriver) ctx.lookup("java:comp/env/ejb/SfulDriverRef");
+ SfulDriver driver = (SfulDriver) ctx.lookup("java:comp/env/ejb/SfulDriverRef");
System.out.println("***Got SfulDriver...");
/**/
stat.addStatus("local LookupUsingJndi", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("local LookupUsingJndi", stat.FAIL);
- ex.printStackTrace();
- }
+ ex.printStackTrace();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java
index d67e10c..d0da261 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
import jakarta.ejb.Local;
-
+
@Local
public interface Sful
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java
index 069647e..8475d7c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java
@@ -38,53 +38,53 @@
}
public boolean initialize() {
- boolean result = false;
+ boolean result = false;
- ref1 = ref2 = createSful();
+ ref1 = ref2 = createSful();
ref1.setSfulRef(ref2);
- return (ref1 != null);
+ return (ref1 != null);
}
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public boolean doRefAliasingTest() {
- boolean result = false;
- for (int i=0; i<10; i++) {
- ref1.incrementCounter();
- }
+ boolean result = false;
+ for (int i=0; i<10; i++) {
+ ref1.incrementCounter();
+ }
- return (ref1.getCounter() == ref2.getCounter());
+ return (ref1.getCounter() == ref2.getCounter());
}
public void doCheckpoint() {
}
public void checkGetRef() {
- Sful ref = ref1.getSfulRef();
+ Sful ref = ref1.getSfulRef();
ref.getCounter();
}
public void createManySfulEJBs(int count) {
/*
- while (count-- > 0) {
- Sful sf = (Sful) createSful();
- }
+ while (count-- > 0) {
+ Sful sf = (Sful) createSful();
+ }
*/
}
private Sful createSful() {
- Sful sful = null;
+ Sful sful = null;
try {
- InitialContext ctx = new InitialContext();
- sful = (Sful) ctx.lookup("java:comp/env/ejb/Sful");
+ InitialContext ctx = new InitialContext();
+ sful = (Sful) ctx.lookup("java:comp/env/ejb/Sful");
} catch (Exception ex) {
- ex.printStackTrace();
+ ex.printStackTrace();
}
- return sful;
+ return sful;
}
public boolean useSfulGreeter() {
- return (sfulGreeter.getCounter() == ref1.getCounter());
+ return (sfulGreeter.getCounter() == ref1.getCounter());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java
index c0649cb..d1bfcd7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java
@@ -22,7 +22,7 @@
@Stateful
public class SfulEJB
- implements Sful, SfulGreeter
+ implements Sful, SfulGreeter
{
private Sful ref;
@@ -40,19 +40,19 @@
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void incrementCounter() {
- counter++;
+ counter++;
}
public int getCounter() {
- return counter;
+ return counter;
}
public void setSfulRef(Sful ref) {
- this.ref = ref;
+ this.ref = ref;
}
public Sful getSfulRef() {
- return ref;
+ return ref;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java
index beeeefc..dcf12a5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
import jakarta.ejb.Local;
-
+
@Local
public interface SfulGreeter
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.properties
index 199757a..68a80cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-ee-remote_client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.xml
index 42f113c..931b582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/SfulProxy.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java
index b5d0211..c2c88f1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java
@@ -25,70 +25,70 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args)
- throws Exception {
+ throws Exception {
stat.addDescription("ejb-ejb30-ee-remote_sfsb");
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-ee-remote_sfsbID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
@EJB
private static SfulProxy proxy;
public void doTest() {
- boolean initialized = proxy.initialize();
+ boolean initialized = proxy.initialize();
stat.addStatus("remote initialize",
- initialized ? stat.PASS : stat.FAIL);
- if (initialized) {
+ initialized ? stat.PASS : stat.FAIL);
+ if (initialized) {
try {
System.out.println("invoking stateless");
String result = proxy.sayHello();
stat.addStatus("remote hello",
- "Hello".equals(result) ? stat.PASS : stat.FAIL);
+ "Hello".equals(result) ? stat.PASS : stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("remote hello" , stat.FAIL);
}
- try {
- for (int i=0; i<5; i++) {
+ try {
+ for (int i=0; i<5; i++) {
String result = proxy.sayRemoteHello();
proxy.doCheckpoint();
- }
- for (int i=0; i<5; i++) {
+ }
+ for (int i=0; i<5; i++) {
String result = proxy.sayRemoteHello();
proxy.sayHello();
- }
- for (int i=0; i<5; i++) {
+ }
+ for (int i=0; i<5; i++) {
String result = proxy.sayRemoteHello();
proxy.doCheckpoint();
- }
+ }
stat.addStatus("remote remote_hello", stat.PASS);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("remote remote_hello" , stat.FAIL);
}
- }
+ }
System.out.println("test complete");
}
private static void sleepFor(int seconds) {
- while (seconds-- > 0) {
- try { Thread.sleep(1000); } catch (Exception ex) {}
- System.out.println("Sleeping for 1 second. Still " + seconds + " seconds left...");
- }
+ while (seconds-- > 0) {
+ try { Thread.sleep(1000); } catch (Exception ex) {}
+ System.out.println("Sleeping for 1 second. Still " + seconds + " seconds left...");
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java
index ae40678..96d9673 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java
@@ -24,51 +24,51 @@
@Stateful
@EJB(name="ejb/Delegate",
- mappedName="corbaname:iiop:localhost:3700#mapped_jndi_name_for_SfulDriver",
- beanInterface=SfulDriver.class)
+ mappedName="corbaname:iiop:localhost:3700#mapped_jndi_name_for_SfulDriver",
+ beanInterface=SfulDriver.class)
public class SfulProxyEJB
- implements SfulProxy {
+ implements SfulProxy {
private SfulDriver delegate;
public boolean initialize() {
/*
- try {
- InitialContext ctx = new InitialContext();
- delegate = (SfulDriver) ctx.lookup("mappedSfulDriver__3_x_Internal_RemoteBusinessHome__");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ try {
+ InitialContext ctx = new InitialContext();
+ delegate = (SfulDriver) ctx.lookup("mappedSfulDriver__3_x_Internal_RemoteBusinessHome__");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
- try {
- InitialContext ctx = new InitialContext();
- delegate = (SfulDriver) ctx.lookup("mappedSfulDriver");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ try {
+ InitialContext ctx = new InitialContext();
+ delegate = (SfulDriver) ctx.lookup("mappedSfulDriver");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
*/
- try {
- InitialContext ctx = new InitialContext();
- delegate = (SfulDriver) ctx.lookup("java:comp/env/ejb/Delegate");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ try {
+ InitialContext ctx = new InitialContext();
+ delegate = (SfulDriver) ctx.lookup("java:comp/env/ejb/Delegate");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
- return (delegate != null);
+ return (delegate != null);
}
public String sayHello() {
- return delegate.sayHello();
+ return delegate.sayHello();
}
public String sayRemoteHello() {
- return delegate.sayRemoteHello();
+ return delegate.sayRemoteHello();
}
public void doCheckpoint() {
- delegate.doCheckpoint();
+ delegate.doCheckpoint();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.properties
index f126714..953c3f7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-ee-remote_sfsb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.xml
index b72c0d9..36ee781 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,21 +46,21 @@
<target name="build" depends="compile">
- <!--build and package .war first so it doesn't contain ejb bean !-->
- <!--classes that have @Stateless/@Stateul !-->
+ <!--build and package .war first so it doesn't contain ejb bean !-->
+ <!--classes that have @Stateless/@Stateul !-->
<antcall target="webclient-war-common">
<param name="hasWebclient" value="true"/>
</antcall>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/SfulDriver.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -68,10 +68,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java
index e28c97f..a66625f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java
@@ -27,21 +27,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
stat.addDescription("ejb-ejb30-ee-remote_sfsb");
Client client = new Client(args);
- //lookupRemoteUsingJndi();
+ //lookupRemoteUsingJndi();
client.doTest();
stat.printSummary("ejb-ejb30-ee-remote_sfsbID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
@EJB(name="ejb/SfulDriver", beanInterface=SfulDriver.class)
private static SfulDriver driver;
@@ -52,13 +52,13 @@
System.out.println("invoking stateless");
String result = driver.sayHello();
stat.addStatus("remote hello",
- "Hello".equals(result) ? stat.PASS : stat.FAIL);
+ "Hello".equals(result) ? stat.PASS : stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("remote hello" , stat.FAIL);
}
- try {
+ try {
String result = driver.sayRemoteHello();
stat.addStatus("remote remote_hello", stat.PASS);
} catch(Exception e) {
@@ -68,24 +68,24 @@
*/
- try {
+ try {
String url = "http://" + "localhost" + ":" + "4848" +
"/ejb-ejb30-hello-session3/servlet";
System.out.println("invoking webclient servlet at " + url);
int code = invokeServlet(url);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
System.out.println("test complete");
}
private static void sleepFor(int seconds) {
- while (seconds-- > 0) {
- try { Thread.sleep(1000); } catch (Exception ex) {}
- System.out.println("Sleeping for 1 second. Still " + seconds + " seconds left...");
- }
+ while (seconds-- > 0) {
+ try { Thread.sleep(1000); } catch (Exception ex) {}
+ System.out.println("Sleeping for 1 second. Still " + seconds + " seconds left...");
+ }
}
private int invokeServlet(String url) throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java
index b150800..e4a71ea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
import jakarta.ejb.Remote;
-
+
@Remote
public interface RemoteSful
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java
index 47fa04c..3dd85d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java
@@ -19,14 +19,14 @@
import jakarta.ejb.Stateful;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
-
+
@Stateful
public class RemoteSfulEJB
- implements RemoteSful {
+ implements RemoteSful {
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public String sayNamaste() {
- return "Remote Hello";
+ return "Remote Hello";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java
index e5c4c90..9904b36 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java
@@ -39,7 +39,7 @@
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public String sayRemoteHello() {
- return remoteSful.sayNamaste();
+ return remoteSful.sayNamaste();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/build.xml
index 62b9758..5dfabcd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/build.xml
@@ -33,10 +33,10 @@
<antcall target="session2"/>
<antcall target="session2full"/>
<antcall target="nopkg"/>
- <antcall target="mdb"/>
- <antcall target="mdb2"/>
+ <antcall target="mdb"/>
+ <antcall target="mdb2"/>
<antcall target="session4"/>
- <antcall target="session5"/>
+ <antcall target="session5"/>
<antcall target="session3"/>
<antcall target="session_standalone"/>
</target>
@@ -71,13 +71,13 @@
<ant dir="session2" target="deploy"/>
<ant dir="session2" target="run"/>
- <!-- needs handle support
+ <!-- needs handle support
<ant dir="dcode" target="build"/>
<ant dir="dcode" target="deploy"/>
<ant dir="dcode" target="run"/>
<ant dir="dcode" target="run"/>
<ant dir="dcode" target="undeploy"/>
- -->
+ -->
<ant dir="session2" target="undeploy"/>
<record name="session2.output" action="stop" />
</target>
@@ -113,9 +113,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb30-hello tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb30-hello tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.properties
index 83634fe..20fdfbe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-dcode"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.xml
index 834000d..116cf76 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="sfulhandle"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,14 +47,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/SfulHome.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -62,11 +62,11 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<delete file="sfulhandle"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java
index 6ee11e7..7a3108a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,13 +34,13 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-dcodeID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB SfulHome sfulHome;
-
+
private static final String HANDLE_FILE_NAME = "sfulhandle";
private Sful[] sfuls = new Sful[20];
@@ -58,11 +58,11 @@
System.out.println("handle file already exists. reconstituting stateful reference");
FileInputStream fis = new FileInputStream(handleFile);
-
+
ObjectInputStream ois = new ObjectInputStream(fis);
for(int i = 0; i < sfuls.length; i++) {
-
+
Handle sfulHandle = (Handle) ois.readObject();
sfuls[i] = (Sful) sfulHandle.getEJBObject();
@@ -79,10 +79,10 @@
stat.addStatus("dcodewithhandles main", stat.PASS);
} else {
-
+
System.out.println("handle file doesn't exist. Creating sful" +
" bean");
-
+
FileOutputStream fos = new FileOutputStream(handleFile);
ObjectOutputStream oos = new ObjectOutputStream(fos);
@@ -101,7 +101,7 @@
oos.close();
System.out.println("test complete");
-
+
stat.addStatus("dcodenohandles main", stat.PASS);
}
@@ -110,8 +110,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/descriptor/sun-ejb-jar.xml
index 6dffd1e..c13bd9b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/descriptor/sun-ejb-jar.xml
@@ -24,7 +24,7 @@
<ejb-name>SfulEJB</ejb-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>1</resize-quantity>
+ <resize-quantity>1</resize-quantity>
<cache-idle-timeout-in-seconds>5</cache-idle-timeout-in-seconds>
</bean-cache>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java
index c02a3c3..f6b41fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java
@@ -24,7 +24,7 @@
@RemoteHome(SfulHome.class)
@Stateful
-public class SfulEJB
+public class SfulEJB
{
// reference to a Remote Business object from another application
@@ -34,7 +34,7 @@
@EJB(mappedName="ejb_ejb30_hello_session2_Sless") com.sun.s1asdev.ejb.ejb30.hello.session2.SlessRemoteHome slessHome;
com.sun.s1asdev.ejb.ejb30.hello.session2.SlessRemote slessRemote;
-
+
@Init
public void create() {
System.out.println("In SfulEJB::create");
@@ -52,20 +52,20 @@
sless.hello();
- try {
+ try {
slessRemote.hello();
- com.sun.s1asdev.ejb.ejb30.hello.session2.SlessRemote
+ com.sun.s1asdev.ejb.ejb30.hello.session2.SlessRemote
anotherRemote = slessHome.create();
-
+
anotherRemote.hello();
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
-
+
System.out.println("Called sless.hello()");
return "hello";
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.properties
index 44d1963..5d63747 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-mdb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.mdb.client.Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml
index bac2cf0..08ad617 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/I*.class,**/*Bean*.class,**/*Hello*" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -77,20 +77,20 @@
</target>
<target name="run_standaloneclient" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/jakarta.jms-api.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
index bad36a1..c7db7b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
@@ -43,7 +43,7 @@
}
- @Resource(name="FooCF", mappedName="jms/ejb_ejb30_hello_mdb_QCF")
+ @Resource(name="FooCF", mappedName="jms/ejb_ejb30_hello_mdb_QCF")
private static QueueConnectionFactory queueConFactory;
@Resource(name="MsgBeanQueue", mappedName="jms/ejb_ejb30_hello_mdb_InQueue")
@@ -60,7 +60,7 @@
private int numMessages = 2;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -69,15 +69,15 @@
public void doTest() {
try {
- if( queueConFactory == null ) {
+ if( queueConFactory == null ) {
- System.out.println("Java SE mode...");
- InitialContext ic = new InitialContext();
- queueConFactory = (jakarta.jms.QueueConnectionFactory) ic.lookup("jms/ejb_ejb30_hello_mdb_QCF");
- msgBeanQueue = (jakarta.jms.Queue) ic.lookup("jms/ejb_ejb30_hello_mdb_InQueue");
- clientQueue = (jakarta.jms.Queue) ic.lookup("jms/ejb_ejb30_hello_mdb_OutQueue");
-
- }
+ System.out.println("Java SE mode...");
+ InitialContext ic = new InitialContext();
+ queueConFactory = (jakarta.jms.QueueConnectionFactory) ic.lookup("jms/ejb_ejb30_hello_mdb_QCF");
+ msgBeanQueue = (jakarta.jms.Queue) ic.lookup("jms/ejb_ejb30_hello_mdb_InQueue");
+ clientQueue = (jakarta.jms.Queue) ic.lookup("jms/ejb_ejb30_hello_mdb_OutQueue");
+
+ }
setup();
doTest(numMessages);
@@ -91,14 +91,14 @@
}
public void setup() throws Exception {
-
+
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
queueReceiver = queueSession.createReceiver(clientQueue);
@@ -116,18 +116,18 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
- System.out.println("Sending message " + i + " to " + queue +
+ System.out.println("Sending message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
queueSender.send(queue, msg);
- System.out.println("Sent message " + i + " to " + queue +
+ System.out.println("Sent message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
}
}
- public void doTest(int num)
+ public void doTest(int num)
throws Exception {
Destination dest = msgBeanQueue;
@@ -141,7 +141,7 @@
System.out.println("Waiting for queue message");
Message recvdmessage = queueReceiver.receive(TIMEOUT);
if( recvdmessage != null ) {
- System.out.println("Received message : " +
+ System.out.println("Received message : " +
((TextMessage)recvdmessage).getText());
} else {
System.out.println("timeout after " + TIMEOUT + " seconds");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/Hello1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/Hello1.java
index 861518b..fccbaed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/Hello1.java
@@ -19,5 +19,5 @@
public interface Hello1 {
public void hello(String s);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java
index 144ea80..946fbf8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java
@@ -38,7 +38,7 @@
msg);
}
@PreDestroy public void myPreDestroyMethod() {
- System.out.println("PRE-DESTROY callback received in " + msg);
+ System.out.println("PRE-DESTROY callback received in " + msg);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java
index cf45901..0c9789a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java
@@ -21,7 +21,7 @@
// Hello1 interface is not annotated with @Local. If the
// bean only implements one interface it is assumed to be
// a local business interface.
-@Stateless(description="my stateless bean description")
+@Stateless(description="my stateless bean description")
public class HelloStateless implements Hello1 {
public void hello(String s) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/InterceptorA.java
index 72d0408..588c96a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/InterceptorA.java
@@ -30,5 +30,5 @@
bean.mname = m.getName();
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
index e4d85c8..e6ea43e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
@@ -44,8 +44,8 @@
@EJB private Hello1 hello1;
@EJB private Hello2 hello2;
- @Resource(name="jms/MyQueueConnectionFactory",
- mappedName="jms/ejb_ejb30_hello_mdb_QCF")
+ @Resource(name="jms/MyQueueConnectionFactory",
+ mappedName="jms/ejb_ejb30_hello_mdb_QCF")
QueueConnectionFactory qcFactory;
String mname = null;
@@ -64,7 +64,7 @@
QueueConnection connection = null;
try {
-
+
System.out.println("Calling hello1 stateless bean");
hello1.hello("local ejb3.0 stateless");
System.out.println("Calling hello2 stateful bean");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.properties
index 52c6596..a669eb3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.properties
@@ -15,20 +15,20 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-mdb2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="glassfish-application-client.xml"
- value="descriptor/glassfish-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="glassfish-application-client.xml"\u0020
+ value="descriptor/glassfish-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.xml
index 50cfebe..848fc89 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class,**/*Hello*" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java
index 784bca8..b3c05f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static @Resource(name="FooCF")
+ private static @Resource(name="FooCF")
QueueConnectionFactory queueConFactory;
public static void main (String[] args) {
@@ -52,7 +52,7 @@
private int numMessages = 2;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -73,17 +73,17 @@
public void setup() throws Exception {
context = new InitialContext();
-
+
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
clientQueue = (jakarta.jms.Queue)
- context.lookup("java:comp/env/jms/MsgBeanClientQueue");
+ context.lookup("java:comp/env/jms/MsgBeanClientQueue");
queueReceiver = queueSession.createReceiver(clientQueue);
@@ -101,18 +101,18 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
- System.out.println("Sending message " + i + " to " + queue +
+ System.out.println("Sending message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
queueSender.send(queue, msg);
- System.out.println("Sent message " + i + " to " + queue +
+ System.out.println("Sent message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
}
}
- public void doTest(String destName, int num)
+ public void doTest(String destName, int num)
throws Exception {
Destination dest = (Destination) context.lookup(destName);
@@ -126,7 +126,7 @@
System.out.println("Waiting for queue message");
Message recvdmessage = queueReceiver.receive(TIMEOUT);
if( recvdmessage != null ) {
- System.out.println("Received message : " +
+ System.out.println("Received message : " +
((TextMessage)recvdmessage).getText());
} else {
System.out.println("timeout after " + TIMEOUT + " seconds");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml
index b14a8c7..90fdeff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml
@@ -83,7 +83,7 @@
<mapped-name>jms/ejb_ejb30_hello_mdb2_InQueue</mapped-name>
-->
<lookup-name>jms/ejb_ejb30_hello_mdb2_InQueue</lookup-name>
-
+
</message-destination>
<message-destination>
<description>description 1</description>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/Hello1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/Hello1.java
index 0df7055..e1d8fa1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/Hello1.java
@@ -19,5 +19,5 @@
public interface Hello1 {
public void hello(String s);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java
index 7afd2b7..faa92f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java
@@ -40,14 +40,14 @@
}
/*
@PreDestroy public void myPreDestroyMethod() {
- System.out.println("PRE-DESTROY callback received in " + msg);
+ System.out.println("PRE-DESTROY callback received in " + msg);
}
*/
public void setSessionContext(jakarta.ejb.SessionContext sc) {
System.out.println("In HelloStateful:setSessionContext");
try {
- SessionContext sc2 = (SessionContext)
+ SessionContext sc2 = (SessionContext)
new InitialContext().lookup("java:comp/EJBContext");
System.out.println("Got SessionContext via java:comp/env/EJBContext");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java
index c1b8391..447cb4a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java
@@ -38,9 +38,9 @@
if( !initialized ) {
throw new EJBException("not initialized");
}
-
+
System.out.println("HelloStateless: " + s);
- timerSvc.createTimer(1, "quick timer");
+ timerSvc.createTimer(1, "quick timer");
System.out.println("Created quick timer");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java
index 1627c4c..d47c26a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java
@@ -32,7 +32,7 @@
System.out.println("In HelloStatelessSuper:mytimeoutmethod");
try {
- // Proprietary way to look up tx manager.
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
new InitialContext().lookup("java:appserver/TransactionManager");
// Use an implementation-specific check to ensure that there
@@ -43,9 +43,9 @@
if( txStatus == Status.STATUS_NO_TRANSACTION ) {
System.out.println("Successfully verified tx attr = " +
"TX_NOT_SUPPORTED in mytimeoutmethod()");
-
+
timeoutHappened = true;
-
+
} else {
System.out.println("Invalid tx status for TX_NOT_SUPPORTED" +
" method " + txStatus);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
index 59fffa4..5f85747 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
@@ -47,19 +47,19 @@
import java.util.Collection;
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-@MessageDriven(messageListenerInterface=MessageListener.class)
+@MessageDriven(messageListenerInterface=MessageListener.class)
public class MessageBean implements jakarta.ejb.MessageDrivenBean {
@EJB(name="hello1") private Hello1 hello1;
@EJB private Hello2 hello2;
-
+
boolean onMessageInterceptorCalled = false;
boolean timeoutInterceptorCalled = false;
@Resource jakarta.ejb.MessageDrivenContext ctx;
@Resource jakarta.ejb.TimerService injectedTimerService;
- @Resource(name="jms/MyQueueConnectionFactory")
+ @Resource(name="jms/MyQueueConnectionFactory")
QueueConnectionFactory qcFactory;
// Values for these will be specified in the standard deployment descriptor
@@ -81,7 +81,7 @@
@Resource int intValue2 = 1;
@Resource Integer integerValue2 = new Integer(1);
- // corresponding env-entry is specified in ejb-jar.xml,
+ // corresponding env-entry is specified in ejb-jar.xml,
// but there is no value so no injection should happen and
// the default value should be used.
int intValue3 = 3;
@@ -143,7 +143,7 @@
} else {
throw new Exception("wrong value for intValue3 = " +
intValue3);
- }
+ }
if( stringValue1.equals("undefined") ||
(intValue1 == 1) || (integerValue1.intValue() == 1) ||
@@ -160,8 +160,8 @@
(intValue2 != 1) || (integerValue2.intValue() != 1) ) {
throw new Exception("env-entry @Resource override error");
}
-
- // Proprietary way to look up tx manager.
+
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
new InitialContext().lookup("java:appserver/TransactionManager");
// Use an implementation-specific check to ensure that there
@@ -176,7 +176,7 @@
throw new Exception("Invalid tx status for TX_NOT_SUPPORTED" +
" method " + txStatus);
}
-
+
System.out.println("Calling hello1 stateless bean");
hello1.hello("local ejb3.0 stateless");
@@ -203,11 +203,11 @@
System.out.println("creating timer");
- TimerService timerService = (TimerService)
+ TimerService timerService = (TimerService)
new InitialContext().lookup("java:comp/TimerService");
-
+
timerService.createTimer(7000, "created timer");
-
+
Collection timers = injectedTimerService.getTimers();
if( timers.size() != 1 ) {
throw new IllegalStateException("invalid timer count = " +
@@ -222,7 +222,7 @@
@Timeout private void timeout(jakarta.ejb.Timer t) {
- QueueConnection connection = null;
+ QueueConnection connection = null;
try {
System.out.println("In MessageBean. Got timeout callback");
@@ -246,7 +246,7 @@
InitialContext ic = new InitialContext();
- // Proprietary way to look up tx manager.
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
ic.lookup("java:appserver/TransactionManager");
// Use an implementation-specific check to ensure that there
@@ -289,9 +289,9 @@
@AroundInvoke
public Object intercept(InvocationContext inv)
- throws Exception
+ throws Exception
{
- System.out.println("[mdb] Interceptor invoked...");
+ System.out.println("[mdb] Interceptor invoked...");
System.out.println("method = " + inv.getMethod());
System.out.println("params = " + inv.getParameters());
int i = 0;
@@ -309,8 +309,8 @@
}
- Object o = inv.proceed();
- System.out.println("[mdb] Interceptor after proceed()...");
+ Object o = inv.proceed();
+ System.out.println("[mdb] Interceptor after proceed()...");
return o;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.properties
index 2f96706..39b89c6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-nopkg"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.xml
index 7b37691..1698561 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="Sful*.class,Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="Client.class,Sful.class,Sless.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java
index ff4ad8f..5a07c31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java
@@ -21,7 +21,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -30,11 +30,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-nopkg-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB(mappedName="Sful") Sful sful;
private static @EJB(mappedName="Sless") Sless sless;
@@ -56,8 +56,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java
index 2c4073c..a8aba87 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java
@@ -15,7 +15,7 @@
*/
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sful
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.properties
index 8ef534f..721ea5f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="simple.client2" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient2"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.xml
index bb47a4c..e53901e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="client/Client.java"/>
</target>
-
+
<target name="compile" depends="clean">
<copy file="client/Client.java.token" tofile="client/Client.java"/>
<replace file="client/Client.java"
@@ -51,14 +51,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sless.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -69,9 +69,9 @@
<antcall target="run_standaloneclient2"/>
</target>
-
+
<target name="run_standaloneclient" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
@@ -80,7 +80,7 @@
</target>
<target name="run_standaloneclient2" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client2}">
@@ -96,7 +96,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java
index 410c711..527c0cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,17 +34,17 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
private static @EJB Sful sful;
-
+
private static @EJB(mappedName="com.sun.s1asdev.ejb.ejb30.hello.session.Sless") Sless sless;
//
- // NOTE: Token 3700 will be replaced in @EJB annotations below
+ // NOTE: Token 3700 will be replaced in @EJB annotations below
// with the value of the port from config.properties during the build
//
private static @EJB(mappedName="corbaname:iiop:localhost:3700#com.sun.s1asdev.ejb.ejb30.hello.session.Sless") Sless sless2;
@@ -58,12 +58,12 @@
try {
// System.out.println("Creating InitialContext()");
-// InitialContext ic = new InitialContext();
+// InitialContext ic = new InitialContext();
-// org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) ic.lookup("java:comp/ORB");
+// org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) ic.lookup("java:comp/ORB");
-// Sful sful = (Sful) ic.lookup("com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
-// Sless sless = (Sless) ic.lookup("com.sun.s1asdev.ejb.ejb30.hello.session.Sless");
+// Sful sful = (Sful) ic.lookup("com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
+// Sless sless = (Sless) ic.lookup("com.sun.s1asdev.ejb.ejb30.hello.session.Sless");
System.out.println("invoking stateful");
sful.hello();
@@ -71,11 +71,11 @@
System.out.println("invoking stateless");
sless.hello();
System.out.println("invoking stateless2");
- sless2.hello();
+ sless2.hello();
System.out.println("invoking stateless3");
- sless3.hello();
+ sless3.hello();
System.out.println("invoking stateless4");
- sless4.hello();
+ sless4.hello();
System.out.println("test complete");
@@ -85,8 +85,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient.java
index d891fb7..795b936 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient.java
@@ -24,7 +24,7 @@
public class StandaloneClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -33,11 +33,11 @@
StandaloneClient client = new StandaloneClient(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-sessionstandaloneID");
- }
-
+ }
+
public StandaloneClient (String[] args) {
}
-
+
public void doTest() {
try {
@@ -49,7 +49,7 @@
Sful sful2 = (Sful) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
-
+
Sful sful3 = (Sful) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sful#com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
@@ -58,7 +58,7 @@
Sless sless2 = (Sless) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sless#com.sun.s1asdev.ejb.ejb30.hello.session.Sless");
-
+
System.out.println("invoking stateful");
sful1.hello();
@@ -88,8 +88,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient2.java
index 4e6d47a..a317f8f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient2.java
@@ -24,7 +24,7 @@
public class StandaloneClient2 {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -33,32 +33,32 @@
StandaloneClient2 client = new StandaloneClient2(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-sessionstandalone2ID");
- }
-
+ }
+
public StandaloneClient2 (String[] args) {
}
-
+
public void doTest() {
try {
Properties props = new Properties();
- props.setProperty("java.naming.factory.initial",
+ props.setProperty("java.naming.factory.initial",
"com.sun.enterprise.naming.SerialInitContextFactory");
- props.setProperty("java.naming.factory.url.pkgs",
+ props.setProperty("java.naming.factory.url.pkgs",
"com.sun.enterprise.naming");
props.setProperty("java.naming.factory.state",
"com.sun.corba.ee.impl.presentation.rmi.JNDIStateFactoryImpl");
-
+
InitialContext ic = new InitialContext(props);
-
+
Sful sful1 = (Sful) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
Sful sful2 = (Sful) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
-
+
Sful sful3 = (Sful) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sful#com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
@@ -67,7 +67,7 @@
Sless sless2 = (Sless) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sless#com.sun.s1asdev.ejb.ejb30.hello.session.Sless");
-
+
System.out.println("invoking stateful");
sful1.hello();
@@ -97,8 +97,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java
index 80af5ba..dda9587 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sful
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.properties
index 7275002..db7df10 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.xml
index 6690b1c..271572f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sless*.class,**/Sful*.class,**/ExternalBusiness.class,**/Foo*.class,**/MyCallbackHandler.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/ClientSuper.class,**/Client.class,**/Sless.class,**/SlessSub.class,**/Sful.class,**/ExternalBusiness.class,**/FooHome.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java
index e556394..397c541 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java
@@ -29,16 +29,16 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-@EJBs(
- { @EJB(name="ejb/TypeLevelSless1", beanName="SlessEJB",
+@EJBs(
+ { @EJB(name="ejb/TypeLevelSless1", beanName="SlessEJB",
beanInterface=Sless.class),
- @EJB(name="ejb/TypeLevelSless2", beanName="SlessEJB2",
+ @EJB(name="ejb/TypeLevelSless2", beanName="SlessEJB2",
beanInterface=Sless.class)
})
@EJB(name="ejb/TypeLevelSless3", beanInterface=SlessSub.class)
public class Client extends ClientSuper {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -47,7 +47,7 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-session2ID");
- }
+ }
private static @EJB Sful sful1;
private static @EJB Sful sful2;
@@ -57,7 +57,7 @@
private static @EJB(beanName="SlessEJB") Sless sless1;
- // linked to SlessEJB2 via sun-application-client.xml
+ // linked to SlessEJB2 via sun-application-client.xml
// so no beanName disambiguation is needed
private static @EJB Sless sless2;
@@ -67,11 +67,11 @@
public Client (String[] args) {
}
-
+
public void doTest() {
try {
-
+
System.out.println("Calling superSless1");
Sless superSlessLookup = (Sless) new javax.naming.InitialContext().lookup("java:comp/env/com.sun.s1asdev.ejb.ejb30.hello.session2.client.ClientSuper/superSless1");
@@ -95,7 +95,7 @@
}
sful1.doRemoveMethodSessionSyncTests();
-
+
// Call application-defined @Remove method. This method has
// no relationship to EJBObject.remove(). It's a coincidence
// that it has the same name.
@@ -236,7 +236,7 @@
if( r1.getId().equals(r2.getId()) ) {
throw new Exception("remote param passing getId() test failed");
}
-
+
sless3.hello();
sless3.hello3();
@@ -265,8 +265,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java
index d89469d..39669b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java
@@ -25,7 +25,7 @@
void callHello() throws RemoteException;
String sayHello() throws RemoteException;
-
+
public boolean assertValidRemoteObject(String msg)
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
index 0e4c3dd..ac8d40c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
@@ -22,7 +22,7 @@
public class MyCallbackHandler {
- @PreDestroy
+ @PreDestroy
public void myPreDestMethod(InvocationContext invCtx) {
System.out.println("In MyCallbackHandler::myPreDestMethod ");
@@ -44,7 +44,7 @@
"callback handler");
}
-
+
try {
invCtx.proceed();
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful.java
index 182bda6..68f57b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful.java
@@ -37,17 +37,17 @@
// for a method that has @Remove behavior so it needs to work.
public void remove();
- // Associated with an @Remove method that has retainIfException=true.
+ // Associated with an @Remove method that has retainIfException=true.
// If argument is true, the method will throw an exception, which should
// keep the bean from being removed. If argument is false, the bean
// should stll be removed.
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception;
- // Associated with an @Remove method that has retainIfException=false.
+ // Associated with an @Remove method that has retainIfException=false.
// Whether the argument is true or false, the bean should still be
// removed.
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception;
// Associated with an @Remove method that has retainIfException=true
@@ -55,7 +55,7 @@
// retainIfException only applies to application exceptions, so
// this bean should always be removed.
public void removeMethodThrowSysException(boolean throwException);
-
+
public void doRemoveMethodSessionSyncTests();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java
index a42c24c..a86e33c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java
@@ -23,17 +23,17 @@
{
public String hello();
- // Associated with an @Remove method that has retainIfException=true.
+ // Associated with an @Remove method that has retainIfException=true.
// If argument is true, the method will throw an exception, which should
// keep the bean from being removed. If argument is false, the bean
// should stll be removed.
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception;
- // Associated with an @Remove method that has retainIfException=false.
+ // Associated with an @Remove method that has retainIfException=false.
// Whether the argument is true or false, the bean should still be
// removed.
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception;
// Associated with an @Remove method that has retainIfException=true
@@ -41,5 +41,5 @@
// retainIfException only applies to application exceptions, so
// this bean should always be removed.
public void removeMethodThrowSysException(boolean throwException);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
index 39e46d0..d61d0c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
@@ -39,10 +39,10 @@
@Stateful
@TransactionManagement(TransactionManagementType.BEAN)
-@EJBs(
- { @EJB(name="ejb/TypeLevelSless1", beanName="SlessEJB",
+@EJBs(
+ { @EJB(name="ejb/TypeLevelSless1", beanName="SlessEJB",
beanInterface=Sless.class),
- @EJB(name="ejb/TypeLevelSless2", beanName="SlessEJB2",
+ @EJB(name="ejb/TypeLevelSless2", beanName="SlessEJB2",
beanInterface=Sless.class) ,
@EJB(name="ejb/SfulEJB2", beanInterface=Sful2.class)
})
@@ -51,7 +51,7 @@
@EJB(name="ejb/TypeLevelSless3", beanInterface=SlessSub.class)
@Remote({Sful.class})
// ejb is not required to put business interface in implements clause
-public class SfulEJB
+public class SfulEJB
{
private @Resource SessionContext sc;
@@ -64,7 +64,7 @@
private @EJB(beanName="SlessEJB") void setSless4(Sless sless) {
sless4 = sless;
}
-
+
private Sless sless5;
@EJB(beanName="SlessEJB2") void setSless5(Sless sless) {
sless5 = sless;
@@ -173,7 +173,7 @@
public void foo(int a, String b) {
}
- private void testSlessRefs(Sless s1, Sless s2, SlessSub s3)
+ private void testSlessRefs(Sless s1, Sless s2, SlessSub s3)
throws Exception {
String sless1Id = s1.getId();
@@ -223,7 +223,7 @@
s3.roundTrip2(c);
s3.hello3();
-
+
}
@PostConstruct
@@ -247,7 +247,7 @@
}
@Remove(retainIfException=true)
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception {
System.out.println("In SfulEJB " + state + " removeRetainIfException");
@@ -258,10 +258,10 @@
}
@Remove
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception {
- System.out.println("In SfulEJB " + state +
+ System.out.println("In SfulEJB " + state +
"removeNotRetainIfException");
System.out.println("throwException = " + throwException);
if( throwException ) {
@@ -272,7 +272,7 @@
@Remove
public void removeMethodThrowSysException(boolean throwException) {
- System.out.println("In SfulEJB " + state +
+ System.out.println("In SfulEJB " + state +
"removeMethodThrowSysException");
System.out.println("throwException = " + throwException);
if( throwException ) {
@@ -299,7 +299,7 @@
SfulEJB2.beforeCompletionCalled &&
SfulEJB2.afterCompletionCalled ) {
System.out.println("Got expected SessionSynch behavior for " +
- "removeRetainIfException(true)");
+ "removeRetainIfException(true)");
} else {
throw new EJBException("SessionSynch failure for " +
"removeRetainIfException(true)");
@@ -320,13 +320,13 @@
!SfulEJB2.beforeCompletionCalled &&
!SfulEJB2.afterCompletionCalled ) {
System.out.println("Got expected SessionSynch behavior for " +
- "removeRetainIfException(false)");
+ "removeRetainIfException(false)");
} else {
throw new EJBException("SessionSynch failure for " +
"removeRetainIfException(true)");
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
index b2f9ddf..6b93ed5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
@@ -43,10 +43,10 @@
// use some package-local mutable static state to check whether
// session synch callbacks are called correctly for @Remove methods.
- // This provides a simple way to check the results since the bean
+ // This provides a simple way to check the results since the bean
// instance is no longer available to the caller. The caller must
// always at most one SFSBs of this bean type at a time for this
- // to work.
+ // to work.
static boolean afterBeginCalled = false;
static boolean beforeCompletionCalled = false;
static boolean afterCompletionCalled = false;
@@ -60,7 +60,7 @@
}
@Remove(retainIfException=true)
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception {
System.out.println("In SfulEJB2 " +
@@ -72,7 +72,7 @@
}
@Remove
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception {
System.out.println("In SfulEJB2 " +
@@ -86,7 +86,7 @@
@Remove
public void removeMethodThrowSysException(boolean throwException) {
- System.out.println("In SfulEJB2 " +
+ System.out.println("In SfulEJB2 " +
"removeMethodThrowSysException");
System.out.println("throwException = " + throwException);
if( throwException ) {
@@ -100,7 +100,7 @@
afterBeginCalled = true;
beforeCompletionCalled = false;
afterCompletionCalled = false;
-
+
System.out.println("In SfulEJB2::afterBegin()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java
index 900eed2..3f86c67 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java
@@ -33,7 +33,7 @@
@Remote(Sless.class)
@RemoteHome(SlessRemoteHome.class)
-public class SlessEJB
+public class SlessEJB
{
@Resource(name="null") SessionContext sc;
@@ -66,11 +66,11 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB::roundTrip2 " +
+ System.out.println("In SlessEJB::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java
index 5d81de3..1e5a85f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java
@@ -43,7 +43,7 @@
@PostConstruct
public void ejbCreate() {
- System.out.println("In SlessEJB2::ejbCreate()");
+ System.out.println("In SlessEJB2::ejbCreate()");
postConstructCalled = true;
}
@@ -72,7 +72,7 @@
public String getId() {
try {
- // Proprietary way to look up tx manager.
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
new InitialContext().lookup("java:appserver/TransactionManager");
// Use an implementation-specific check to ensure that there
@@ -94,7 +94,7 @@
return "SlessEJB2";
}
-
+
public Sless roundTrip(Sless s) {
System.out.println("In SlessEJB2::roundTrip " + s);
System.out.println("input Sless.getId() = " + s.getId());
@@ -102,12 +102,12 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB2::roundTrip2 " +
+ System.out.println("In SlessEJB2::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
@@ -118,10 +118,10 @@
sc_ = sc;
}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java
index 09811f3..40c6af9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java
@@ -39,7 +39,7 @@
private @Resource SessionContext ejbContext2;
- @Resource(type=jakarta.ejb.SessionContext.class)
+ @Resource(type=jakarta.ejb.SessionContext.class)
private EJBContext ejbContext3;
private EJBContext ejbContext4;
@@ -78,7 +78,7 @@
private void setEJBContext6(EJBContext context) {
ejbContext6 = context;
}
-
+
@PostConstruct
public void afterCreate() {
System.out.println("In SlessEJB3::afterCreate() marked as PostConstruct");
@@ -136,13 +136,13 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB3::roundTrip2 " +
+ System.out.println("In SlessEJB3::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.properties
index 83429c2..77d377d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session2full"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.xml
index 21f06e5..e6127fd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/ClientSuper.class,**/Client.class,**/Sless.class,**/SlessSub.class,**/Sful.class,**/ExternalBusiness.class,**/FooHome.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java
index 2e687b2..62cb179 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java
@@ -26,7 +26,7 @@
public class Client extends ClientSuper {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -35,7 +35,7 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-session2fullID");
- }
+ }
private static Sful sful1;
private static Sful sful2;
@@ -44,7 +44,7 @@
private static Sless sless1;
- // linked to SlessEJB2 via sun-application-client.xml
+ // linked to SlessEJB2 via sun-application-client.xml
// so no beanName disambiguation is needed
private static Sless sless2;
@@ -54,11 +54,11 @@
public Client (String[] args) {
}
-
+
public void doTest() {
try {
-
+
System.out.println("Calling superSless1");
superSless1.hello();
System.out.println("Called superSless1");
@@ -78,7 +78,7 @@
if( get1.equals(get2) ) {
throw new Exception("SFSB get test failed");
}
-
+
// Call application-defined @Remove method. This method has
// no relationship to EJBObject.remove(). It's a coincidence
// that it has the same name.
@@ -196,7 +196,7 @@
if( r1.getId().equals(r2.getId()) ) {
throw new Exception("remote param passing getId() test failed");
}
-
+
sless3.hello();
sless3.hello3();
@@ -227,8 +227,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/descriptor/ejb-jar.xml
index 69216b4..20676f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/descriptor/ejb-jar.xml
@@ -234,7 +234,7 @@
<interceptor-class>com.sun.s1asdev.ejb.ejb30.hello.session2full.MyCallbackHandler</interceptor-class>
<pre-destroy>
<lifecycle-callback-method>myPreDestroyMethod</lifecycle-callback-method>
- </pre-destroy>
+ </pre-destroy>
</interceptor>
</interceptors>
<assembly-descriptor>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java
index 6218d31..8a5c797 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java
@@ -25,7 +25,7 @@
void callHello() throws RemoteException;
String sayHello() throws RemoteException;
-
+
public boolean assertValidRemoteObject(String msg)
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sful.java
index 21eed88..ce9abfc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sful.java
@@ -37,16 +37,16 @@
// for a method that has @Remove behavior so it needs to work.
public void remove();
- // Associated with an @Remove method that has retainIfException=true.
+ // Associated with an @Remove method that has retainIfException=true.
// If argument is true, the method will throw an exception, which should
// keep the bean from being removed. If argument is false, the bean
// should stll be removed.
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception;
- // Associated with an @Remove method that has retainIfException=false.
+ // Associated with an @Remove method that has retainIfException=false.
// Whether the argument is true or false, the bean should still be
// removed.
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java
index cfe957f..12dec63 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java
@@ -25,7 +25,7 @@
import java.util.Collection;
import java.util.HashSet;
-public class SfulEJB
+public class SfulEJB
{
private SessionContext sc;
@@ -39,7 +39,7 @@
private void setSless4(Sless sless) {
sless4_ = sless;
}
-
+
private Sless sless5_;
void setSless5(Sless sless) {
sless5_ = sless;
@@ -108,7 +108,7 @@
public void foo(int a, String b) {
}
- private void testSlessRefs(Sless s1, Sless s2, SlessSub s3)
+ private void testSlessRefs(Sless s1, Sless s2, SlessSub s3)
throws Exception {
String sless1Id = s1.getId();
@@ -158,7 +158,7 @@
s3.roundTrip2(c);
s3.hello3();
-
+
}
public void afterCreate() {
@@ -169,7 +169,7 @@
System.out.println("In SfulEJB " + state + " @Remove method");
}
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception {
System.out.println("In SfulEJB " + state + " removeRetainIfException");
@@ -179,10 +179,10 @@
}
}
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception {
- System.out.println("In SfulEJB " + state +
+ System.out.println("In SfulEJB " + state +
"removeNotRetainIfException");
System.out.println("throwException = " + throwException);
if( throwException ) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java
index 1564863..5650716 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java
@@ -22,7 +22,7 @@
import java.util.Iterator;
import jakarta.transaction.UserTransaction;
-public class SlessEJB
+public class SlessEJB
{
@@ -46,11 +46,11 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB::roundTrip2 " +
+ System.out.println("In SlessEJB::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java
index 9042b33..fb68203 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java
@@ -53,7 +53,7 @@
public String getId() {
try {
- // Proprietary way to look up tx manager.
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
new InitialContext().lookup("java:appserver/TransactionManager");
// Use an implementation-specific check to ensure that there
@@ -75,7 +75,7 @@
return "SlessEJB2";
}
-
+
public Sless roundTrip(Sless s) {
System.out.println("In SlessEJB2::roundTrip " + s);
System.out.println("input Sless.getId() = " + s.getId());
@@ -83,12 +83,12 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB2::roundTrip2 " +
+ System.out.println("In SlessEJB2::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
@@ -103,10 +103,10 @@
sc_ = sc;
}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java
index 5bc4362..df3b683 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java
@@ -49,7 +49,7 @@
private void setEJBContext6(EJBContext context) {
ejbContext6_ = context;
}
-
+
public String hello() {
System.out.println("In SlessEJB3:hello()");
@@ -97,13 +97,13 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB3::roundTrip2 " +
+ System.out.println("In SlessEJB3::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.properties
index 966e0f8..b15565e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session3"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.xml
index 4d680ff..147d4b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -56,7 +56,7 @@
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
@@ -69,7 +69,7 @@
</jar>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello**.class" />
</antcall>
@@ -82,8 +82,8 @@
</fileset>
</jar>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create.sql"/>
@@ -96,7 +96,7 @@
</antcall>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -106,10 +106,10 @@
<param name="appclient.application.args" value="${http.host} ${http.port}"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Client.java
index 491c71b..a6b4717 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Client.java
@@ -31,33 +31,33 @@
import jakarta.persistence.EntityManager;
public class Client {
-
+
private String host;
private String port;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- @PersistenceUnit
+ @PersistenceUnit
private static EntityManagerFactory emf1;
- @PersistenceUnit(name="myemf", unitName="foo")
+ @PersistenceUnit(name="myemf", unitName="foo")
private static EntityManagerFactory emf2;
public Client (String[] args) {
host = ( args.length > 0) ? args[0] : "localhost";
port = ( args.length > 1) ? args[1] : "4848";
}
-
+
public static void main(String[] args) {
stat.addDescription("ejb-ejb30-hello-session3client");
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-session3ID");
}
-
+
public void doTest() {
-
+
String env = null;
try {
@@ -81,11 +81,11 @@
}
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/ejb-ejb30-hello-session3/servlet";
System.out.println("invoking webclient servlet at " + url);
int code = invokeServlet(url);
-
+
if(code != 200) {
System.out.println("Incorrect return code: " + code);
stat.addStatus("webclient main", stat.FAIL);
@@ -97,15 +97,15 @@
stat.addStatus("webclient main", stat.FAIL);
ex.printStackTrace();
}
-
+
return;
-
+
}
private int invokeServlet(String url) throws Exception {
-
+
URL u = new URL(url);
-
+
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
@@ -118,6 +118,6 @@
}
return code;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Person.java
index f0f17b0..f7168c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Person.java
@@ -30,10 +30,10 @@
public Person(String name){
this.name = name;
}
-
+
@Override public String toString(){
return "Person: {"+"(name = "+name+")}";
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/Hello.java
index a5d933f..54bcca0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/Hello.java
@@ -19,5 +19,5 @@
public interface Hello {
public void hello();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
index af957f0..f93839c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
@@ -28,16 +28,16 @@
@Stateless public class HelloEJB implements Hello {
- @PersistenceUnit
+ @PersistenceUnit
private EntityManagerFactory emf1;
- @PersistenceUnit(name="myemf", unitName="foo")
+ @PersistenceUnit(name="myemf", unitName="foo")
private EntityManagerFactory emf2;
@PersistenceContext
private EntityManager em1;
- @PersistenceContext(name="myem", unitName="foo")
+ @PersistenceContext(name="myem", unitName="foo")
private EntityManager em2;
public void hello() {
@@ -59,11 +59,11 @@
EntityManager lookupem2 = (EntityManager)
ic.lookup("java:comp/env/myem");
-
+
} catch(Exception e) {
throw new jakarta.ejb.EJBException(e);
}
-
+
System.out.println("HelloEJB successful injection of EMF/EM references!");
} else {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStateful.java
index d85568a..45b0d10 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStateful.java
@@ -19,7 +19,7 @@
public interface HelloStateful {
public void hello();
-
+
public void sleepFor(int sec);
public void ping();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
index a3d7e90..727594c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
@@ -27,7 +27,7 @@
@AccessTimeout(0)
@Stateful public class HelloStatefulEJB implements HelloStateful {
-
+
@PersistenceContext(name="myem",
unitName="foo", type=PersistenceContextType.EXTENDED)
private EntityManager em;
@@ -42,12 +42,12 @@
public void sleepFor(int sec) {
System.out.println("In HelloStatefulEJB::sleepFor()");
- try {
- for (int i=0 ; i<sec; i++) {
- Thread.currentThread().sleep(1000);
- }
- } catch (Exception ex) {
- }
+ try {
+ for (int i=0 ; i<sec; i++) {
+ Thread.currentThread().sleep(1000);
+ }
+ } catch (Exception ex) {
+ }
System.out.println("Finished HelloStatefulEJB::sleepFor()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Hello.java
index a5d933f..54bcca0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Hello.java
@@ -19,5 +19,5 @@
public interface Hello {
public void hello();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/HelloStateful.java
index d85568a..45b0d10 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/HelloStateful.java
@@ -19,7 +19,7 @@
public interface HelloStateful {
public void hello();
-
+
public void sleepFor(int sec);
public void ping();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
index 68bbd52..0c67042 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
@@ -80,30 +80,30 @@
}
- @PersistenceUnit
+ @PersistenceUnit
private EntityManagerFactory emf1;
- @PersistenceUnit(name="myemf", unitName="foo")
+ @PersistenceUnit(name="myemf", unitName="foo")
private EntityManagerFactory emf2;
@PersistenceContext
private EntityManager em1;
- @PersistenceContext(name="myem",
+ @PersistenceContext(name="myem",
unitName="foo", type=PersistenceContextType.TRANSACTION)
private EntityManager em2;
public void init( ServletConfig config) throws ServletException {
-
+
super.init(config);
System.out.println("In webclient::servlet... init()");
}
-
+
public void service ( HttpServletRequest req , HttpServletResponse resp ) throws ServletException, IOException {
-
+
resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
-
+
try {
InitialContext ic = new InitialContext();
@@ -122,7 +122,7 @@
EntityManager lookupem2 = (EntityManager)
ic.lookup("java:comp/env/myem");
-
+
System.out.println("Servlet successful injection of EMF/EM references!");
} else {
throw new Exception("One or more EMF/EM references" +
@@ -152,17 +152,17 @@
helloStateful.hello();
helloStateful2.hello();
- Hello helloStateless3 = (Hello)
+ Hello helloStateless3 = (Hello)
ic.lookup("java:comp/env/helloStateless3");
helloStateless3.hello();
- Hello helloStateless4 = (Hello)
+ Hello helloStateless4 = (Hello)
ic.lookup("java:comp/env/helloStateless4");
helloStateless4.hello();
- HelloStateful helloStateful3 = (HelloStateful)
+ HelloStateful helloStateful3 = (HelloStateful)
ic.lookup("java:comp/env/helloStateful3");
helloStateful3.hello();
@@ -194,66 +194,66 @@
System.out.println("ds6 login timeout = " + loginTimeout);
- try {
- MyThread thread = new MyThread(helloStateful2);
- thread.start();
+ try {
+ MyThread thread = new MyThread(helloStateful2);
+ thread.start();
- sleepFor(10);
- helloStateful2.ping();
- throw new EJBException("Did not get ConcurrentAccessException");
- } catch (jakarta.ejb.ConcurrentAccessException conEx) {
- System.out.println("Got expected ConcurrentAccessException"); //Everything is fine
- } catch (Throwable th) {
- throw new EJBException("Got some wierd exception: " + th);
- }
+ sleepFor(10);
+ helloStateful2.ping();
+ throw new EJBException("Did not get ConcurrentAccessException");
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
+ System.out.println("Got expected ConcurrentAccessException"); //Everything is fine
+ } catch (Throwable th) {
+ throw new EJBException("Got some wierd exception: " + th);
+ }
System.out.println("successfully accessed connections");
out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
-
+
}catch (Exception ex) {
ex.printStackTrace();
System.out.println("webclient servlet test failed");
throw new ServletException(ex);
- }
+ }
}
-
-
+
+
public void destroy() {
System.out.println("in webclient::servlet destroy");
}
class MyThread extends Thread {
- HelloStateful ref;
+ HelloStateful ref;
- MyThread(HelloStateful ref) {
- this.ref = ref;
- }
+ MyThread(HelloStateful ref) {
+ this.ref = ref;
+ }
- public void run() {
- try {
- ref.sleepFor(20);
- } catch (Throwable th) {
- throw new RuntimeException("Could not invoke waitfor() method");
- }
- }
+ public void run() {
+ try {
+ ref.sleepFor(20);
+ } catch (Throwable th) {
+ throw new RuntimeException("Could not invoke waitfor() method");
+ }
+ }
}
private void sleepFor(int sec) {
- try {
- for (int i=0 ; i<sec; i++) {
- Thread.currentThread().sleep(1000);
- System.out.println("[" + i + "/" + sec + "]: Sleeping....");
- }
- } catch (Exception ex) {
- }
+ try {
+ for (int i=0 ; i<sec; i++) {
+ Thread.currentThread().sleep(1000);
+ System.out.println("[" + i + "/" + sec + "]: Sleeping....");
+ }
+ } catch (Exception ex) {
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.properties
index b0cb867..21b66fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session4"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.xml
index 5efdbca..e7c163a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,35 +46,35 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sful2.class,**/Sless.class"/>
</antcall>
<echo message="appclient.jar=${assemble.dir}/${appname}-client.jar"/>
<jar jarfile="${assemble.dir}/${appname}-client.jar" update="yes">
- <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
+ <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
excludes="META-INF/**"/>
</jar>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
<!-- Don't deploy client in order to test that dynamic byte code
-generation is working.
+generation is working.
<antcall target="deploy-client-common"/>
-->
</target>
<target name="run" depends="init-common">
- <echo message="appclient -client ${assemble.dir}/${appname}-clientClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
+ <echo message="appclient -client ${assemble.dir}/${appname}-clientClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
<exec executable="${APPCLIENT}" failonerror="false">
<!-- Don't deploy client in order to test that dynamic byte code
-generation is working.
+generation is working.
<arg line="-client
${assemble.dir}/${appname}-clientClient.jar"/>
-->
@@ -87,15 +87,15 @@
<arg line="${appclient.application.args}"/>
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
<!-- Don't deploy client in order to test that dynamic byte code
-generation is working.
+generation is working.
<antcall target="undeploy-client-common"/>
-->
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java
index f8720f7..94f30b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,8 +34,8 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-session4ID");
- }
-
+ }
+
public Client (String[] args) {
}
@@ -57,9 +57,9 @@
public void doTest() {
try {
- InitialContext ic = new InitialContext();
+ InitialContext ic = new InitialContext();
- sful = (Sful) ic.lookup("ejb_ejb30_hello_session4_Sful#com.sun.s1asdev.ejb.ejb30.hello.session4.Sful");
+ sful = (Sful) ic.lookup("ejb_ejb30_hello_session4_Sful#com.sun.s1asdev.ejb.ejb30.hello.session4.Sful");
System.out.println("invoking stateful");
String sfulId = "1";
sful.setId(sfulId);
@@ -73,7 +73,7 @@
System.out.println("Expected id " + sfulId);
System.out.println("Received id " + sful_2Id);
if( !sful_2Id.equals(sfulId) ) {
- throw new Exception("sful bean id mismatch " +
+ throw new Exception("sful bean id mismatch " +
sfulId + " , " + sful_2Id);
}
@@ -83,7 +83,7 @@
System.out.println("invoking stateless");
- sless = (Sless) ic.lookup("com.sun.s1asdev.ejb.ejb30.hello.session4.Sless");
+ sless = (Sless) ic.lookup("com.sun.s1asdev.ejb.ejb30.hello.session4.Sless");
sless.hello();
System.out.println("test complete");
@@ -94,8 +94,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java
index 26440ec..daa1af4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java
@@ -29,5 +29,5 @@
// defined on both remote business interfaces
public void sameMethod();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java
index 37493fe..a1c291f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java
@@ -53,6 +53,6 @@
public void sameMethod() {
System.out.println("In SfulEJB:sameMethod()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java
index 29f0c73..9879860 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java
@@ -22,7 +22,7 @@
// Use @Remote without parameters. If there's only one ambiguous
// interface in implements clause, it will be treate as @Remote instead of
// @Local
-@Remote
+@Remote
@Stateless
public class SlessEJB implements Sless
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.properties
index b3e1096..5421032 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session5"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.xml
index b3bfc90..d88affb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,28 +46,28 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class,**/MyInterceptor*.class"/>
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful2.class,**/Sless2.class"/>
</antcall>
<echo message="appclient.jar=${assemble.dir}/${appname}-client.jar"/>
<jar jarfile="${assemble.dir}/${appname}-client.jar" update="yes">
- <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
+ <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
excludes="META-INF/**"/>
</jar>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
<antcall target="deploy-client-common"/>
</target>
<target name="run" depends="init-common">
- <echo message="appclient -client ${assemble.dir}/${appname}-clientClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
+ <echo message="appclient -client ${assemble.dir}/${appname}-clientClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
<exec executable="${APPCLIENT}" failonerror="false">
<arg line="-client ${assemble.dir}/${appname}-clientClient.jar"/>
<arg line="-name ${appname}Client"/>
@@ -78,11 +78,11 @@
<arg line="${appclient.application.args}"/>
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
<antcall target="undeploy-client-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java
index 9cd7fa2..36fce5b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,8 +34,8 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-session5ID");
- }
-
+ }
+
/**
* This test ensures that we don't assume a remote ejb client has
* access to all the classes for all the remote business interfaces that
@@ -43,7 +43,7 @@
* remote business interfaces, but this client only uses Sful2 and
* Sless2 and does not package the Sful or Sless classes at all. The
* internal generated RMI-IIOP stubs created at runtime should not
- * cause any classloading errors in the client.
+ * cause any classloading errors in the client.
*/
public Client (String[] args) {
}
@@ -73,8 +73,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor.java
index ef74b3b..ff13010 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor.java
@@ -28,7 +28,7 @@
return postConstructCalled;
}
- @PostConstruct
+ @PostConstruct
private void postConstruct(InvocationContext ctx) {
postConstructCalled = true;
System.out.println("MyInterceptor::postConstruct called");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor2.java
index 8f0c8f2..503e9b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor2.java
@@ -29,7 +29,7 @@
}
- @PostConstruct
+ @PostConstruct
private void postConstruct(InvocationContext ctx) {
postConstructCalled = true;
System.out.println("MyInterceptor2::postConstruct called");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
index 8ddd1a4..79dcce7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
@@ -50,6 +50,6 @@
System.out.println("In SfulEJB:hello2()");
return "hello2";
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.properties
index 8d344e0..3516703 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session_standalone"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.xml
index 80a941a..ecc33b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,28 +46,28 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sless.class"/>
</antcall>
<echo message="appclient.jar=${assemble.dir}/${appname}-client.jar"/>
<jar jarfile="${assemble.dir}/${appname}-client.jar" update="yes">
- <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
+ <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
excludes="META-INF/**"/>
</jar>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
<antcall target="deploy-client-common"/>
</target>
<target name="run" depends="init-common">
- <echo message="appclient -client ${assemble.dir}/${appname}-clientClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
+ <echo message="appclient -client ${assemble.dir}/${appname}-clientClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
<exec executable="${APPCLIENT}" failonerror="false">
<arg line="-client ${assemble.dir}/${appname}-clientClient.jar"/>
<arg line="-name ${appname}Client"/>
@@ -78,11 +78,11 @@
<arg line="${appclient.application.args}"/>
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
<antcall target="undeploy-client-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java
index ef1eb88..13d259e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java
@@ -24,7 +24,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -33,8 +33,8 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-session_standaloneID");
- }
-
+ }
+
public Client (String[] args) {
}
@@ -76,8 +76,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java
index 24adcc2..454f23b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java
@@ -37,12 +37,12 @@
return timeoutWasCalled;
}
- @Timeout
+ @Timeout
private void timeout(Timer t) {
System.out.println("in SlessEJB:timeout");
timeoutWasCalled = true;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.properties
index 87ffb6c..d678c2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-interceptors-bindings"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.interceptors.bindings.client.StandaloneClient"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.xml
index 588641e..20267ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class,**/Common*.class,**/Interceptor*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sless.class,**/Sful2.class,**/Sless3.class,**/Sless4.class,**/Sless5.class,**/Sless6.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java
index 33fa70a..2120f94 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java
@@ -24,7 +24,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -33,11 +33,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-interceptors-bindingsID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB Sful sful;
private static @EJB Sful2 sful2;
private static @EJB Sless3 sless3;
@@ -101,10 +101,10 @@
sless6.ag();
sless6.ag(1);
-
+
sless6.bg();
sless6.bg(1);
-
+
sless6.cg();
sless6.cg(1);
sless6.cg("foo", 1.0);
@@ -124,8 +124,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
index 85ad44f..593b350 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
@@ -29,16 +29,16 @@
static void aroundInvokeCalled(InvocationContext ctx, String id) {
- List<String> interceptors = (List<String>)
+ List<String> interceptors = (List<String>)
ctx.getContextData().get(INTERCEPTORS_PROP);
-
+
if( interceptors == null ) {
interceptors = new LinkedList<String>();
ctx.getContextData().put(INTERCEPTORS_PROP, interceptors);
}
interceptors.add(id);
-
+
}
static void checkResults(InvocationContext ctx) {
@@ -56,9 +56,9 @@
for( char nextChar : methodNameUpper.toCharArray() ) {
expected.add(nextChar + "");
}
- }
+ }
- List<String> actual = (List<String>)
+ List<String> actual = (List<String>)
ctx.getContextData().get(INTERCEPTORS_PROP);
String msg = "Expected " + expected + " for method " +
@@ -74,5 +74,5 @@
System.out.println("Successful interceptor chain : " + msg);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
index f24f29e..979a0bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
@@ -26,7 +26,7 @@
public class InterceptorA {
@Resource SessionContext sessionCtx;
-
+
@PostConstruct
private void postConstruct(InvocationContext ctx) {
try {
@@ -38,7 +38,7 @@
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
// access injected environment dependency
System.out.println("invoked business interface = " +
@@ -47,10 +47,10 @@
// look up ejb-ref defined within default interceptor in ejb-jar.xml
InitialContext ic = new InitialContext();
Sless3 sless3 = (Sless3) ic.lookup("java:comp/env/ejb/Sless3");
-
-
+
+
Common.aroundInvokeCalled(ctx, "A");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorB.java
index 497bb9b..6869fb6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorB.java
@@ -33,9 +33,9 @@
// around-invoke declared in ejb-jar.xml
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundInvokeCalled(ctx, "B");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorC.java
index 20f6fb6..9556dda 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorC.java
@@ -33,9 +33,9 @@
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundInvokeCalled(ctx, "C");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorD.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorD.java
index 7c1669b..d6c1ef7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorD.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorD.java
@@ -33,9 +33,9 @@
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundInvokeCalled(ctx, "D");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorE.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorE.java
index 136d2cf..89d644d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorE.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorE.java
@@ -33,9 +33,9 @@
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundInvokeCalled(ctx, "E");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorF.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorF.java
index 772fb40..a1662f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorF.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorF.java
@@ -33,9 +33,9 @@
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundInvokeCalled(ctx, "F");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorG.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorG.java
index eb400b2..38934aa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorG.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorG.java
@@ -33,7 +33,7 @@
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundInvokeCalled(ctx, "G");
Object instance = ctx.getTarget();
if( instance instanceof SlessEJB6 ) {
@@ -41,5 +41,5 @@
}
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java
index 42b3e1a..b94be8a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sful
{
@@ -38,7 +38,7 @@
public void cdef();
- public void abcdef();
+ public void abcdef();
public void acbdfe();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java
index 3a12684..e471a51 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sful2
{
@@ -29,6 +29,6 @@
public void ef();
public void cdef();
-
+
public void nothing();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
index a565ed8..5d89d05 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
@@ -41,7 +41,7 @@
@ExcludeDefaultInterceptors
public void cd() {
- System.out.println("in SfulEJB:cd(). postConstruct = " +
+ System.out.println("in SfulEJB:cd(). postConstruct = " +
postConstructCalled);
if( !postConstructCalled ) {
@@ -82,16 +82,16 @@
@ExcludeDefaultInterceptors
@Interceptors({InterceptorE.class, InterceptorF.class})
public void cdef() {}
-
+
@ExcludeDefaultInterceptors
@ExcludeClassInterceptors
public void nothing() {}
- @Interceptors({InterceptorE.class, InterceptorF.class})
+ @Interceptors({InterceptorE.class, InterceptorF.class})
public void abcdef() {}
// total ordering overridden in deployment descriptor
- @Interceptors({InterceptorE.class, InterceptorF.class})
+ @Interceptors({InterceptorE.class, InterceptorF.class})
public void acbdfe() {}
// declared in ejb-jar.xml
@@ -106,5 +106,5 @@
throw new EJBException(e);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
index f5d19ed..446493d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
@@ -32,7 +32,7 @@
private boolean aroundInvokeCalled = false;
public void cd() {
- System.out.println("in SfulEJB:cd(). aroundInvokeCalled = " +
+ System.out.println("in SfulEJB:cd(). aroundInvokeCalled = " +
aroundInvokeCalled);
// a little extra checking to make sure aroundInvoke is invoked...
@@ -53,12 +53,12 @@
@ExcludeClassInterceptors
public void abef(int i) {}
- // @ExcludeDefaultInterceptors is a no-op here since it
+ // @ExcludeDefaultInterceptors is a no-op here since it
// was already excluded at class-level
@ExcludeDefaultInterceptors
@Interceptors({InterceptorE.class, InterceptorF.class})
public void cdef() {}
-
+
@ExcludeClassInterceptors
public void nothing() {}
@@ -74,5 +74,5 @@
throw new EJBException(e);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java
index 8622ee3..ac1e93e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless3
{
@@ -35,7 +35,7 @@
public void dcef();
- public void dcbaef();
+ public void dcbaef();
public void abcdef();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java
index c8e3911..abd983d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless4
{
@@ -29,6 +29,6 @@
public void ef();
public void cbdef();
-
+
public void nothing();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java
index 7d24ce3..cc6b3e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless5
{
@@ -25,6 +25,6 @@
public void abdc();
public void dcfe();
-
+
public void nothing();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java
index 8993276..7390129 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless6
{
@@ -29,7 +29,7 @@
public void bg();
public void bg(int param);
-
+
public void cg();
public void cg(int param);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
index 480566f..fa89467 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
@@ -50,16 +50,16 @@
@ExcludeDefaultInterceptors
@Interceptors({InterceptorE.class, InterceptorF.class})
public void dcef() {}
-
+
@ExcludeDefaultInterceptors
@ExcludeClassInterceptors
public void nothing() {}
- @Interceptors({InterceptorE.class, InterceptorF.class})
+ @Interceptors({InterceptorE.class, InterceptorF.class})
public void dcbaef() {}
// total ordering overridden in deployment descriptor
- @Interceptors({InterceptorE.class, InterceptorF.class})
+ @Interceptors({InterceptorE.class, InterceptorF.class})
public void abcdef() {}
// binding described in deployment descriptor
@@ -71,5 +71,5 @@
Common.checkResults(ctx);
return null;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
index 724ccf6..989a4fe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
@@ -35,7 +35,7 @@
private boolean aroundInvokeCalled = false;
public void cbd() {
- System.out.println("in SlessEJB4:cbd(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB4:cbd(). aroundInvokeCalled = " +
aroundInvokeCalled);
// a little extra checking to make sure aroundInvoke is invoked...
@@ -56,12 +56,12 @@
InterceptorE.class, InterceptorF.class})
public void abef(int i) {}
- // @ExcludeDefaultInterceptors is a no-op here since it
+ // @ExcludeDefaultInterceptors is a no-op here since it
// was already excluded at class-level
@ExcludeDefaultInterceptors
@Interceptors({InterceptorE.class, InterceptorF.class})
public void cbdef() {}
-
+
@ExcludeClassInterceptors
public void nothing() {}
@@ -77,7 +77,7 @@
throw new EJBException(e);
}
}
-
+
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
index 0a573d0..c6327f1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
@@ -37,7 +37,7 @@
private boolean aroundInvokeCalled = false;
public void abdc() {
- System.out.println("in SlessEJB5:abdc(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB5:abdc(). aroundInvokeCalled = " +
aroundInvokeCalled);
// a little extra checking to make sure aroundInvoke is invoked...
@@ -68,7 +68,7 @@
throw new EJBException(e);
}
}
-
+
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
index ed905f6..29f501a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
@@ -35,10 +35,10 @@
{
boolean aroundInvokeCalled = false;
-
+
@Interceptors({InterceptorA.class, InterceptorG.class})
public void ag() {
- System.out.println("in SlessEJB6:ag(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:ag(). aroundInvokeCalled = " +
aroundInvokeCalled);
if( !aroundInvokeCalled ) {
@@ -50,17 +50,17 @@
public void ag(int param1) {
System.out.println("in SlessEJB6:ag(int param). " +
"aroundInvokeCalled = " + aroundInvokeCalled);
-
+
if( aroundInvokeCalled ) {
aroundInvokeCalled = false;
throw new EJBException("bean class aroundInvoke was incorrectly called");
}
}
- // bg() (but not bg(param)) marked through ejb-jar.xml
+ // bg() (but not bg(param)) marked through ejb-jar.xml
// as having interceptors B,G
public void bg() {
- System.out.println("in SlessEJB6:bg(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:bg(). aroundInvokeCalled = " +
aroundInvokeCalled);
if( !aroundInvokeCalled ) {
@@ -72,7 +72,7 @@
public void bg(int param1) {
System.out.println("in SlessEJB6:bg(int param). " +
"aroundInvokeCalled = " + aroundInvokeCalled);
-
+
if( aroundInvokeCalled ) {
aroundInvokeCalled = false;
throw new EJBException("bean class aroundInvoke was incorrectly called");
@@ -82,7 +82,7 @@
// overloaded version of interceptor-binding used in ejb-jar.xml to
// mark all methods with name cg as having interceptors C,G
public void cg() {
- System.out.println("in SlessEJB6:cg(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:cg(). aroundInvokeCalled = " +
aroundInvokeCalled);
if( !aroundInvokeCalled ) {
@@ -92,7 +92,7 @@
}
public void cg(int param1) {
- System.out.println("in SlessEJB6:cg(int). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:cg(int). aroundInvokeCalled = " +
aroundInvokeCalled);
if( !aroundInvokeCalled ) {
@@ -102,7 +102,7 @@
}
public void cg(String param1, double param2) {
- System.out.println("in SlessEJB6:cg(String, double). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:cg(String, double). aroundInvokeCalled = " +
aroundInvokeCalled);
if( !aroundInvokeCalled ) {
@@ -112,11 +112,11 @@
}
- // Kind of like ag(), in that dg() is overloaded, but it's the
+ // Kind of like ag(), in that dg() is overloaded, but it's the
// signature that has a parameter that is assigned interceptors using
// @Interceptor.
public void dg() {
- System.out.println("in SlessEJB6:dg(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:dg(). aroundInvokeCalled = " +
aroundInvokeCalled);
if( aroundInvokeCalled ) {
@@ -129,7 +129,7 @@
public void dg(int param1) {
System.out.println("in SlessEJB6:dg(int param). " +
"aroundInvokeCalled = " + aroundInvokeCalled);
-
+
if( !aroundInvokeCalled ) {
throw new EJBException("bean class aroundInvoke not called");
}
@@ -141,7 +141,7 @@
// Like dg(), except that dg(int param) is assigned its interceptor
// chain through ejb-jar.xml
public void eg() {
- System.out.println("in SlessEJB6:eg(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:eg(). aroundInvokeCalled = " +
aroundInvokeCalled);
if( aroundInvokeCalled ) {
@@ -153,15 +153,15 @@
public void eg(int param1) {
System.out.println("in SlessEJB6:eg(int param). " +
"aroundInvokeCalled = " + aroundInvokeCalled);
-
+
if( !aroundInvokeCalled ) {
throw new EJBException("bean class aroundInvoke not called");
}
aroundInvokeCalled = false;
}
-
+
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/build.xml
index 77ec3e9..ada25e9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/build.xml
@@ -30,7 +30,7 @@
<target name="all">
<antcall target="bindings"/>
- <antcall target="session"/>
+ <antcall target="session"/>
<antcall target="inheritence"/>
<antcall target="mdb"/>
</target>
@@ -60,9 +60,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb30-interceptors tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb30-interceptors tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.properties
index ef0f4af..3fd98e1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.properties
@@ -15,17 +15,17 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-interceptors-session"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
+<property name="test.client"\u0020
- value="Client"/>
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
@@ -35,15 +35,15 @@
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
+<property name="application-client.xml"\u0020
- value="descriptor/application-client.xml"/>
+ value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
+<property name="sun-application-client.xml"\u0020
- value="descriptor/sun-application-client.xml"/>
+ value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.xml
index 5368e66..17baaaa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.xml
@@ -50,7 +50,7 @@
</target>
-
+
<target name="compile" depends="clean">
@@ -74,21 +74,21 @@
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Exception.class,**/*Interceptor*.class,**/Dummy*.class,**/Sless*.class,**/Sful*.class,"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Exception.class,**/Client.class,**/Sful.class"/>
</antcall>
- </target>
+ </target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
@@ -104,13 +104,13 @@
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java
index 4037f05..660a7df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java
@@ -53,14 +53,14 @@
private static @EJB Sful sful9;
public void doTest() {
- doTest1();
- doTest2();
- doTest3();
- doTest4();
- doTest6();
- /** doTest7_8(); **/ // enable when we have passivation
- doTest9();
- doTest10();
+ doTest1();
+ doTest2();
+ doTest3();
+ doTest4();
+ doTest6();
+ /** doTest7_8(); **/ // enable when we have passivation
+ doTest9();
+ doTest10();
}
private void doTest1() {
@@ -68,9 +68,9 @@
System.out.println("invoking stateful");
sful.hello();
- System.out.println("+++++++++++++++++++++++++++++++++++++++");
- System.out.println("+++++ InterceptorCallCount: " + sful.getCount());
- System.out.println("+++++++++++++++++++++++++++++++++++++++");
+ System.out.println("+++++++++++++++++++++++++++++++++++++++");
+ System.out.println("+++++ InterceptorCallCount: " + sful.getCount());
+ System.out.println("+++++++++++++++++++++++++++++++++++++++");
stat.addStatus("local test1" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
@@ -83,8 +83,8 @@
sful.throwAppException("XYZ");
stat.addStatus("local test2" , stat.FAIL);
} catch (AppException appEx) {
- System.out.println("Got expected AppException: " + appEx);
- stat.addStatus("local test2" , stat.PASS);
+ System.out.println("Got expected AppException: " + appEx);
+ stat.addStatus("local test2" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("local test2" , stat.FAIL);
@@ -94,10 +94,10 @@
private void doTest3() {
try {
String result = sful.computeMid(4, 10);
- System.out.println("[Test3]: Got: " + result);
+ System.out.println("[Test3]: Got: " + result);
stat.addStatus("local test3" , stat.PASS);
} catch (SwapArgumentsException swapEx) {
- System.out.println("Got unexpected Exception: " + swapEx);
+ System.out.println("Got unexpected Exception: " + swapEx);
stat.addStatus("local test3" , stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
@@ -108,11 +108,11 @@
private void doTest4() {
try {
String result = sful.computeMid(23, 10);
- System.out.println("[Test4]: Got: " + result
- + " INSTEAD of SwapArgumentsException");
+ System.out.println("[Test4]: Got: " + result
+ + " INSTEAD of SwapArgumentsException");
stat.addStatus("local test4" , stat.FAIL);
} catch (SwapArgumentsException swapEx) {
- System.out.println("Got expected Exception: " + swapEx);
+ System.out.println("Got expected Exception: " + swapEx);
stat.addStatus("local test4" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
@@ -125,7 +125,7 @@
sful.eatException();
stat.addStatus("local test6" , stat.PASS);
} catch(Exception e) {
- System.out.println("Got unexpected Exception: " + e);
+ System.out.println("Got unexpected Exception: " + e);
e.printStackTrace();
stat.addStatus("local test6" , stat.FAIL);
}
@@ -133,30 +133,30 @@
private void doTest7_8() {
try {
- int sz = 20;
+ int sz = 20;
Context ctx = new InitialContext();
- sful.resetLifecycleCallbackCounters();
- Sful[] sfuls = new Sful[sz];
- for (int i=0; i<sz; i++) {
- sfuls[i] = (Sful) ctx.lookup("com.sun.s1asdev.ejb.ejb30.interceptors.session.Sful");
- int prevIndex = (i ==0) ? 0 : i-1;
- System.out.println("Created sful["+i+"]: " + sfuls[i] + " ==> "
- + sfuls[prevIndex].equals(sfuls[i]));
- sfuls[i].setID(i);
+ sful.resetLifecycleCallbackCounters();
+ Sful[] sfuls = new Sful[sz];
+ for (int i=0; i<sz; i++) {
+ sfuls[i] = (Sful) ctx.lookup("com.sun.s1asdev.ejb.ejb30.interceptors.session.Sful");
+ int prevIndex = (i ==0) ? 0 : i-1;
+ System.out.println("Created sful["+i+"]: " + sfuls[i] + " ==> "
+ + sfuls[prevIndex].equals(sfuls[i]));
+ sfuls[i].setID(i);
sfuls[i].getCount();
- }
- sleepFor(10);
- for (int i=0; i<sz; i++) {
- sfuls[i].getCount();
- }
- int passivationCount = sful.getPrePassivateCallbackCount();
- int activationCount = sful.getPostActivateCallbackCount();
+ }
+ sleepFor(10);
+ for (int i=0; i<sz; i++) {
+ sfuls[i].getCount();
+ }
+ int passivationCount = sful.getPrePassivateCallbackCount();
+ int activationCount = sful.getPostActivateCallbackCount();
boolean status = (passivationCount > 0) && (activationCount> 0);
System.out.println("passivation: " + passivationCount + "; "
- + "activation: " + activationCount);
+ + "activation: " + activationCount);
stat.addStatus("local test7" ,
- (status == true) ? stat.PASS : stat.FAIL);
+ (status == true) ? stat.PASS : stat.FAIL);
boolean stateRestored = true;
for (int i=0; i<sz; i++) {
@@ -175,40 +175,40 @@
}
public void doTest9() {
- try {
- sful.isInterceptorCallCounOK();
- sful.isInterceptorCallCounOK();
- sful.isInterceptorCallCounOK();
- sful.isInterceptorCallCounOK();
- String resultStr = sful.isInterceptorCallCounOK();
- boolean result = "true true true true".equals(resultStr);
- stat.addStatus("local test9 " + resultStr ,
- (result) ? stat.PASS : stat.FAIL);
- } catch (Exception ex) {
- stat.addStatus("local test9" , stat.FAIL);
- }
- }
+ try {
+ sful.isInterceptorCallCounOK();
+ sful.isInterceptorCallCounOK();
+ sful.isInterceptorCallCounOK();
+ sful.isInterceptorCallCounOK();
+ String resultStr = sful.isInterceptorCallCounOK();
+ boolean result = "true true true true".equals(resultStr);
+ stat.addStatus("local test9 " + resultStr ,
+ (result) ? stat.PASS : stat.FAIL);
+ } catch (Exception ex) {
+ stat.addStatus("local test9" , stat.FAIL);
+ }
+ }
public void doTest10() {
- try {
- String resultStr = sful.isPostConstructCallCounOK();
- boolean result = "true true true true".equals(resultStr);
- stat.addStatus("local test10 " + resultStr ,
- (result) ? stat.PASS : stat.FAIL);
- } catch (Exception ex) {
- stat.addStatus("local test10" , stat.FAIL);
- }
- }
+ try {
+ String resultStr = sful.isPostConstructCallCounOK();
+ boolean result = "true true true true".equals(resultStr);
+ stat.addStatus("local test10 " + resultStr ,
+ (result) ? stat.PASS : stat.FAIL);
+ } catch (Exception ex) {
+ stat.addStatus("local test10" , stat.FAIL);
+ }
+ }
private static void sleepFor(int seconds) {
- while (seconds-- > 0) {
- try {
- System.out.println("" + seconds + " left...");
- Thread.currentThread().sleep(1000);
- } catch (InterruptedException inEx) {
- }
- }
+ while (seconds-- > 0) {
+ try {
+ System.out.println("" + seconds + " left...");
+ Thread.currentThread().sleep(1000);
+ } catch (InterruptedException inEx) {
+ }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/descriptor/sun-ejb-jar.xml
index 9bc87c7..c0b7e7c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/descriptor/sun-ejb-jar.xml
@@ -24,7 +24,7 @@
<ejb-name>SfulEJB</ejb-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>2</resize-quantity>
+ <resize-quantity>2</resize-quantity>
</bean-cache>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
index c3a08d6..ae08967 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
@@ -26,7 +26,7 @@
import jakarta.ejb.PostActivate;
public class BaseInterceptor
- implements java.io.Serializable {
+ implements java.io.Serializable {
protected static final String BASE_INTERCEPTOR_NAME = "BaseInterceptor";
@@ -41,9 +41,9 @@
@PostConstruct
private void basePostConstruct(InvocationContext ctx)
- throws RuntimeException {
- postConstructList = new ArrayList<String>();
- postConstructList.add(BASE_INTERCEPTOR_NAME);
+ throws RuntimeException {
+ postConstructList = new ArrayList<String>();
+ postConstructList.add(BASE_INTERCEPTOR_NAME);
ctx.getContextData().put(getName(), this);
basePCCount++;
System.out.println("GGGG: @PostConstruct for: " + this.getClass().getName());
@@ -59,24 +59,24 @@
@AroundInvoke
public Object baseAroundInvoke(InvocationContext ctx)
- throws Exception
+ throws Exception
{
- aroundInvokeList = new ArrayList<String>();
- aroundInvokeList.add(BASE_INTERCEPTOR_NAME);
- ctx.getContextData().put(getName(), this);
- baseAICount++;
- return ctx.proceed();
+ aroundInvokeList = new ArrayList<String>();
+ aroundInvokeList.add(BASE_INTERCEPTOR_NAME);
+ ctx.getContextData().put(getName(), this);
+ baseAICount++;
+ return ctx.proceed();
}
@PrePassivate
public void prePassivate(InvocationContext ctx) {
- prePassivateCount++;
- }
+ prePassivateCount++;
+ }
@PostActivate
public void postActivate(InvocationContext ctx) {
- postActivateCount++;
- }
+ postActivateCount++;
+ }
String getName() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLevel2Interceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLevel2Interceptor.java
index eba31f3..9a9b7dc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLevel2Interceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLevel2Interceptor.java
@@ -30,7 +30,7 @@
@PostConstruct
protected void overridablePostConstructMethod(InvocationContext ctx)
- throws RuntimeException {
+ throws RuntimeException {
postConstructList.add(LEVEL2_INTERCEPTOR_NAME);
baseLevel2PCCount++;
try {
@@ -44,8 +44,8 @@
@AroundInvoke
protected Object overridableAroundInvokeMethod(InvocationContext ctx)
- throws Throwable {
- aroundInvokeList.add(LEVEL2_INTERCEPTOR_NAME);
+ throws Throwable {
+ aroundInvokeList.add(LEVEL2_INTERCEPTOR_NAME);
baseLevel2AICount++;
return ctx.proceed();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
index f8f77cf..48ec2f2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
@@ -25,7 +25,7 @@
import jakarta.ejb.SessionContext;
public class BaseLifecycleInterceptor
- implements java.io.Serializable {
+ implements java.io.Serializable {
protected int basePrePassivateCount = 0;
protected int basePostActivateCount = 0;
@@ -36,12 +36,12 @@
@PrePassivate
private void prePassivate(InvocationContext ctx) {
- basePrePassivateCount++;
+ basePrePassivateCount++;
}
@PostActivate
private void postActivate(InvocationContext ctx) {
- basePostActivateCount++;
+ basePostActivateCount++;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DistinctMethodsInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DistinctMethodsInterceptor.java
index 6545c6a..55a49b6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DistinctMethodsInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DistinctMethodsInterceptor.java
@@ -32,7 +32,7 @@
@PostConstruct
private void distinctPostConstruct(InvocationContext ctx) throws RuntimeException {
- postConstructList.add(DISTINCT_INTERCEPTOR_NAME);
+ postConstructList.add(DISTINCT_INTERCEPTOR_NAME);
distinctPCCount++;
try {
ctx.proceed();
@@ -46,7 +46,7 @@
@AroundInvoke
private Object distinctMethodInterceptor(InvocationContext ctx)
throws Throwable {
- aroundInvokeList.add(DISTINCT_INTERCEPTOR_NAME);
+ aroundInvokeList.add(DISTINCT_INTERCEPTOR_NAME);
distinctAICount++;
return ctx.proceed();
}
@@ -54,29 +54,29 @@
protected boolean isAICountOK() {
return (distinctAICount == baseAICount)
&& (distinctAICount == baseLevel2AICount)
- && checkForCorrectSequence(aroundInvokeList);
- }
+ && checkForCorrectSequence(aroundInvokeList);
+ }
protected boolean isPostConstructCallCounOK() {
return (distinctPCCount == basePCCount)
&& (distinctPCCount == baseLevel2PCCount)
- && checkForCorrectSequence(postConstructList);
+ && checkForCorrectSequence(postConstructList);
}
private boolean checkForCorrectSequence(List<String> list) {
- boolean result = list.size() == 3;
- if (result) {
- BASE_INTERCEPTOR_NAME.equals(list.get(0));
- LEVEL2_INTERCEPTOR_NAME.equals(list.get(1));
- DISTINCT_INTERCEPTOR_NAME.equals(list.get(2));
- }
+ boolean result = list.size() == 3;
+ if (result) {
+ BASE_INTERCEPTOR_NAME.equals(list.get(0));
+ LEVEL2_INTERCEPTOR_NAME.equals(list.get(1));
+ DISTINCT_INTERCEPTOR_NAME.equals(list.get(2));
+ }
- for(String str : list) {
- System.out.println("**DISTINCT_INTERCEPTOR_TEST**: " + str);
- }
- System.out.println("**DISTINCT_INTERCEPTOR_TEST**: " + result);
+ for(String str : list) {
+ System.out.println("**DISTINCT_INTERCEPTOR_TEST**: " + str);
+ }
+ System.out.println("**DISTINCT_INTERCEPTOR_TEST**: " + result);
- return result;
+ return result;
}
String getName() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Dummy.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Dummy.java
index d246932..8884459 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Dummy.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Dummy.java
@@ -28,11 +28,11 @@
- public String isInterceptorCallCounOK();
+ public String isInterceptorCallCounOK();
- public String isPostConstructCallCounOK();
+ public String isPostConstructCallCounOK();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
index 524e27a..b447e34 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
@@ -34,22 +34,22 @@
protected int dummyBaseAICount = 0;
protected int dummyBaseEJBPostConstructCount = 0;
- @AroundInvoke
- private Object dummyBaseAroundInvoke(InvocationContext ctx)
- throws Exception {
- aroundInvokeList = new ArrayList<String>();
- aroundInvokeList.add("DummyBaseEJB");
- dummyBaseAICount++;
- return ctx.proceed();
- }
+ @AroundInvoke
+ private Object dummyBaseAroundInvoke(InvocationContext ctx)
+ throws Exception {
+ aroundInvokeList = new ArrayList<String>();
+ aroundInvokeList.add("DummyBaseEJB");
+ dummyBaseAICount++;
+ return ctx.proceed();
+ }
- @PostConstruct
+ @PostConstruct
private void dummyBasePostConstruct() {
- postConstructList = new ArrayList<String>();
- postConstructList.add("DummyBaseEJB");
- dummyBaseEJBPostConstructCount++;
- System.out.println("GGGG: DummyLevel2EJB.postConstruct ");
- }
+ postConstructList = new ArrayList<String>();
+ postConstructList.add("DummyBaseEJB");
+ dummyBaseEJBPostConstructCount++;
+ System.out.println("GGGG: DummyLevel2EJB.postConstruct ");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
index f6e2804..afb58f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
@@ -24,14 +24,14 @@
import jakarta.annotation.PostConstruct;
@Interceptors({
- com.sun.s1asdev.ejb.ejb30.interceptors.session.OverridingMethodsInterceptor.class,
- com.sun.s1asdev.ejb.ejb30.interceptors.session.DistinctMethodsInterceptor.class
+ com.sun.s1asdev.ejb.ejb30.interceptors.session.OverridingMethodsInterceptor.class,
+ com.sun.s1asdev.ejb.ejb30.interceptors.session.DistinctMethodsInterceptor.class
})
@Stateless
public class DummyEJB
- extends DummyLevel2EJB
- implements Dummy
+ extends DummyLevel2EJB
+ implements Dummy
{
int interceptorId;
private boolean createCalled = false;
@@ -47,13 +47,13 @@
@PostConstruct
protected void overridablePostConstruct()
{
- postConstructList.add("DummyEJB");
+ postConstructList.add("DummyEJB");
createCalled = true;
dummyEJBPostConstructCount++;
}
public String dummy() {
- return "Dummy!!";
+ return "Dummy!!";
}
public void setInterceptorId(int val) {
@@ -66,63 +66,63 @@
public String isInterceptorCallCounOK() {
- boolean beanAIResult = (beanAICount == dummyBaseAICount)
- && (beanAICount == dummyLevel2AICount)
- && checkAroundInvokeSequence();
+ boolean beanAIResult = (beanAICount == dummyBaseAICount)
+ && (beanAICount == dummyLevel2AICount)
+ && checkAroundInvokeSequence();
- return "" + distinctInterceptor.isAICountOK()
- + " " + overridingInterceptor.isAICountOK()
- + " " + beanAIResult
- + " " + checkAroundInvokeSequence();
- }
+ return "" + distinctInterceptor.isAICountOK()
+ + " " + overridingInterceptor.isAICountOK()
+ + " " + beanAIResult
+ + " " + checkAroundInvokeSequence();
+ }
public String isPostConstructCallCounOK() {
- boolean beanPCCountResult = (dummyEJBPostConstructCount == dummyBaseEJBPostConstructCount)
- && (dummyLevel2EJBPostConstructCount == 0)
- && checkPostConstructSequence();
+ boolean beanPCCountResult = (dummyEJBPostConstructCount == dummyBaseEJBPostConstructCount)
+ && (dummyLevel2EJBPostConstructCount == 0)
+ && checkPostConstructSequence();
- return "" + distinctInterceptor.isPostConstructCallCounOK()
- + " " + overridingInterceptor.isPostConstructCallCounOK()
- + " " + beanPCCountResult
- + " " + checkPostConstructSequence();
- }
+ return "" + distinctInterceptor.isPostConstructCallCounOK()
+ + " " + overridingInterceptor.isPostConstructCallCounOK()
+ + " " + beanPCCountResult
+ + " " + checkPostConstructSequence();
+ }
@AroundInvoke
Object myOwnAroundInvoke(InvocationContext ctx)
throws Exception {
- aroundInvokeList.add("DummyEJB");
- if (distinctInterceptor == null) {
- distinctInterceptor = (DistinctMethodsInterceptor)
- ctx.getContextData().get(distinctAIName);
- overridingInterceptor = (OverridingMethodsInterceptor)
- ctx.getContextData().get(overridingAIName);
- }
+ aroundInvokeList.add("DummyEJB");
+ if (distinctInterceptor == null) {
+ distinctInterceptor = (DistinctMethodsInterceptor)
+ ctx.getContextData().get(distinctAIName);
+ overridingInterceptor = (OverridingMethodsInterceptor)
+ ctx.getContextData().get(overridingAIName);
+ }
- beanAICount++;
+ beanAICount++;
return ctx.proceed();
}
private boolean checkPostConstructSequence() {
- boolean result = postConstructList.size() == 2;
- if (result) {
- "DummyBaseEJB".equals(postConstructList.get(0));
- "DummyEJB".equals(postConstructList.get(1));
- }
+ boolean result = postConstructList.size() == 2;
+ if (result) {
+ "DummyBaseEJB".equals(postConstructList.get(0));
+ "DummyEJB".equals(postConstructList.get(1));
+ }
- return result;
+ return result;
}
private boolean checkAroundInvokeSequence() {
- boolean result = aroundInvokeList.size() == 3;
- if (result) {
- "DummyBaseEJB".equals(aroundInvokeList.get(0));
- "DummyLevel2EJB".equals(aroundInvokeList.get(1));
- "DummyEJB".equals(aroundInvokeList.get(2));
- }
+ boolean result = aroundInvokeList.size() == 3;
+ if (result) {
+ "DummyBaseEJB".equals(aroundInvokeList.get(0));
+ "DummyLevel2EJB".equals(aroundInvokeList.get(1));
+ "DummyEJB".equals(aroundInvokeList.get(2));
+ }
- return result;
+ return result;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
index 199a132..a4fc622 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
@@ -25,24 +25,24 @@
public class DummyLevel2EJB
- extends DummyBaseEJB
+ extends DummyBaseEJB
{
protected int dummyLevel2AICount = 0;
- protected int dummyLevel2EJBPostConstructCount = 0;
+ protected int dummyLevel2EJBPostConstructCount = 0;
- @PostConstruct
+ @PostConstruct
protected void overridablePostConstruct() {
- postConstructList.add("DummyLevel2EJB");
- dummyLevel2EJBPostConstructCount++;
- System.out.println("GGGG: DummyLevel2EJB.postConstruct ");
- }
+ postConstructList.add("DummyLevel2EJB");
+ dummyLevel2EJBPostConstructCount++;
+ System.out.println("GGGG: DummyLevel2EJB.postConstruct ");
+ }
- @AroundInvoke
- protected Object overridableAroundInvoke(InvocationContext ctx)
- throws Exception {
- aroundInvokeList.add("DummyLevel2EJB");
- dummyLevel2AICount++;
- return ctx.proceed();
- }
+ @AroundInvoke
+ protected Object overridableAroundInvoke(InvocationContext ctx)
+ throws Exception {
+ aroundInvokeList.add("DummyLevel2EJB");
+ dummyLevel2AICount++;
+ return ctx.proceed();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
index 0421ece..fca97fd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
@@ -42,7 +42,7 @@
private static int postActivateCallbackCount = 0;
-
+
private int interceptorID;
@@ -60,7 +60,7 @@
void prePassivate(InvocationContext ctx) {
- prePassivateCallbackCount++;
+ prePassivateCallbackCount++;
}
@@ -70,7 +70,7 @@
private void postActivate(InvocationContext ctx) {
- postActivateCallbackCount++;
+ postActivateCallbackCount++;
}
@@ -80,7 +80,7 @@
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
if (ctx.getMethod().getName().equals("setID")) {
@@ -104,7 +104,7 @@
public static void resetLifecycleCallbackCounters() {
- prePassivateCallbackCount = postActivateCallbackCount = 0;
+ prePassivateCallbackCount = postActivateCallbackCount = 0;
}
@@ -112,7 +112,7 @@
public static int getPrePassivateCallbackCount() {
- return prePassivateCallbackCount;
+ return prePassivateCallbackCount;
}
@@ -120,11 +120,11 @@
public static int getPostActivateCallbackCount() {
- return postActivateCallbackCount;
+ return postActivateCallbackCount;
}
-
+
@@ -136,7 +136,7 @@
}
-
+
int getInterceptorID() {
@@ -144,17 +144,17 @@
}
-
+
boolean checkInterceptorID(int val) {
- return (val == interceptorID) &&
+ return (val == interceptorID) &&
(computedInterceptorID == 2 * val + 1);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/OverridingMethodsInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/OverridingMethodsInterceptor.java
index f5f8bf3..2dcb167 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/OverridingMethodsInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/OverridingMethodsInterceptor.java
@@ -24,7 +24,7 @@
import jakarta.annotation.PostConstruct;
public class OverridingMethodsInterceptor
- extends BaseLevel2Interceptor {
+ extends BaseLevel2Interceptor {
protected static final String OVERRIDING_INTERCEPTOR_NAME = "OverridingInterceptor";
@@ -34,7 +34,7 @@
@PostConstruct
protected void overridablePostConstructMethod(InvocationContext ctx)
- throws RuntimeException {
+ throws RuntimeException {
postConstructList.add(OVERRIDING_INTERCEPTOR_NAME);
pcCount++;
try {
@@ -49,38 +49,38 @@
@AroundInvoke
protected Object overridableAroundInvokeMethod(InvocationContext ctx)
- throws Throwable
+ throws Throwable
{
- aroundInvokeList.add(OVERRIDING_INTERCEPTOR_NAME);
+ aroundInvokeList.add(OVERRIDING_INTERCEPTOR_NAME);
aiCount++;
return ctx.proceed();
}
protected boolean isAICountOK() {
- return (0 == baseLevel2AICount)
- && (aiCount == baseAICount)
- && checkForCorrectSequence(aroundInvokeList);
- }
+ return (0 == baseLevel2AICount)
+ && (aiCount == baseAICount)
+ && checkForCorrectSequence(aroundInvokeList);
+ }
- protected boolean isPostConstructCallCounOK() {
- return (pcCount == basePCCount)
- && (baseLevel2PCCount == 0)
- && checkForCorrectSequence(postConstructList);
- }
+ protected boolean isPostConstructCallCounOK() {
+ return (pcCount == basePCCount)
+ && (baseLevel2PCCount == 0)
+ && checkForCorrectSequence(postConstructList);
+ }
private boolean checkForCorrectSequence(List<String> list) {
- boolean result = list.size() == 2;
- if (result) {
- BASE_INTERCEPTOR_NAME.equals(list.get(0));
- OVERRIDING_INTERCEPTOR_NAME.equals(list.get(1));
- }
- for(String str : list) {
- System.out.println("**OVERRIDING_INTERCEPTOR_TEST**: " + str);
- }
- System.out.println("**OVERRIDING_INTERCEPTOR_TEST**: " + result);
+ boolean result = list.size() == 2;
+ if (result) {
+ BASE_INTERCEPTOR_NAME.equals(list.get(0));
+ OVERRIDING_INTERCEPTOR_NAME.equals(list.get(1));
+ }
+ for(String str : list) {
+ System.out.println("**OVERRIDING_INTERCEPTOR_TEST**: " + str);
+ }
+ System.out.println("**OVERRIDING_INTERCEPTOR_TEST**: " + result);
- return result;
+ return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java
index d03bf26..ec704a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java
@@ -42,13 +42,13 @@
public String computeMid(int min, int max)
- throws SwapArgumentsException;
+ throws SwapArgumentsException;
public String callDummy()
- throws Exception;
+ throws Exception;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
index cbefc15..8f213e4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
@@ -38,11 +38,11 @@
@Interceptors({
- LifecycleCallbackInterceptor.class,
+ LifecycleCallbackInterceptor.class,
- BaseLifecycleInterceptor.class
+ BaseLifecycleInterceptor.class
- })
+ })
public class SfulEJB implements Sful
@@ -80,13 +80,13 @@
private Object interceptCall(InvocationContext ctx)
- throws Exception
+ throws Exception
{
- System.out.println("**Beans AROUNDINVOKE++ [@AroundInvoke]: " + ctx.getMethod());
+ System.out.println("**Beans AROUNDINVOKE++ [@AroundInvoke]: " + ctx.getMethod());
- count++;
+ count++;
try {
@@ -112,7 +112,7 @@
public int getCount() {
- return count;
+ return count;
}
@@ -132,15 +132,15 @@
public String computeMid(int min, int max)
- throws SwapArgumentsException
+ throws SwapArgumentsException
{
- return sless.sayHello()
+ return sless.sayHello()
- + ", Midpoint of " + min + ", " + max + "; "
+ + ", Midpoint of " + min + ", " + max + "; "
- + sless.computeMidPoint(min, max);
+ + sless.computeMidPoint(min, max);
}
@@ -148,11 +148,11 @@
public String callDummy()
- throws Exception
+ throws Exception
{
- return dummy.dummy();
+ return dummy.dummy();
}
@@ -174,7 +174,7 @@
public int getPrePassivateCallbackCount() {
- return LifecycleCallbackInterceptor.getPrePassivateCallbackCount();
+ return LifecycleCallbackInterceptor.getPrePassivateCallbackCount();
}
@@ -182,7 +182,7 @@
public int getPostActivateCallbackCount() {
- return LifecycleCallbackInterceptor.getPostActivateCallbackCount();
+ return LifecycleCallbackInterceptor.getPostActivateCallbackCount();
}
@@ -190,7 +190,7 @@
public void resetLifecycleCallbackCounters() {
- LifecycleCallbackInterceptor.resetLifecycleCallbackCounters();
+ LifecycleCallbackInterceptor.resetLifecycleCallbackCounters();
}
@@ -218,51 +218,51 @@
{
- try {
+ try {
- return dummy.isInterceptorCallCounOK();
+ return dummy.isInterceptorCallCounOK();
- } catch (Exception ex) {
+ } catch (Exception ex) {
- System.out.println("*********");
+ System.out.println("*********");
- ex.printStackTrace();
+ ex.printStackTrace();
- System.out.println("*********");
+ System.out.println("*********");
- }
+ }
- return null;
+ return null;
- }
+ }
- public String isPostConstructCallCounOK()
+ public String isPostConstructCallCounOK()
- {
+ {
- try {
+ try {
- return dummy.isPostConstructCallCounOK();
+ return dummy.isPostConstructCallCounOK();
- } catch (Exception ex) {
+ } catch (Exception ex) {
- System.out.println("*********");
+ System.out.println("*********");
- ex.printStackTrace();
+ ex.printStackTrace();
- System.out.println("*********");
+ System.out.println("*********");
- }
+ }
- return null;
+ return null;
- }
+ }
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java
index a2ab35a..5f98465 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java
@@ -34,7 +34,7 @@
public double computeMidPoint(int min, int max)
- throws SwapArgumentsException;
+ throws SwapArgumentsException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java
index 3304b90..4efd526 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java
@@ -30,13 +30,13 @@
public class SlessEJB
- implements Sless
+ implements Sless
{
public String sayHello() {
- return "Hello";
+ return "Hello";
}
@@ -44,17 +44,17 @@
public double computeMidPoint(int min, int max)
- throws SwapArgumentsException
+ throws SwapArgumentsException
{
- if (min > max) {
+ if (min > max) {
- throw new SwapArgumentsException("("+min+", "+max+")");
+ throw new SwapArgumentsException("("+min+", "+max+")");
- }
+ }
- return (min*1.0+max)/2.0;
+ return (min*1.0+max)/2.0;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java
index ee21ea7..a3a9d56 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java
@@ -27,7 +27,7 @@
private static @EJB Sless sless;
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -36,23 +36,23 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-interceptors-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
System.out.println("invoking sless");
String result1 = sless.concatAndReverse("<One>", "<Two>");
String result2 = sless.concatAndReverse("<One>", "Null");
String result3 = sless.concatAndReverse("nuLL", "Null");
- System.out.println("Got : " + result1);
- System.out.println("Got : " + result2);
- System.out.println("Got : " + result3);
+ System.out.println("Got : " + result1);
+ System.out.println("Got : " + result2);
+ System.out.println("Got : " + result3);
- System.out.println("Got : " + sless.plus((byte) 2, (short) 3, 4));
- System.out.println("Got : " + sless.isGreaterShort(new Short((short) 5), new Long(7)));
+ System.out.println("Got : " + sless.plus((byte) 2, (short) 3, 4));
+ System.out.println("Got : " + sless.isGreaterShort(new Short((short) 5), new Long(7)));
stat.addStatus("local test1" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/ArgumentsVerifier.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/ArgumentsVerifier.java
index 0c75a35..5295f08 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/ArgumentsVerifier.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/ArgumentsVerifier.java
@@ -25,7 +25,7 @@
@AroundInvoke
public Object interceptCall(InvocationContext ctx)
- throws MyBadException, Exception
+ throws MyBadException, Exception
{
Method method = ctx.getMethod();
String methodName = method.getName();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
index c905417..7a1fec8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
@@ -22,10 +22,10 @@
@Stateless
public class SlessEJB
- implements Sless
+ implements Sless
{
public String sayHello() {
- return "Hello";
+ return "Hello";
}
@Interceptors(ArgumentsVerifier.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.properties
index 724976e..ea5dfc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-interceptors-mdb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.xml
index fd8cab0..233b8c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class,**/*Hello*,**/*Interceptor*" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
index 2b7cd66..86a0450 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
@@ -52,7 +52,7 @@
private int numMessages = 2;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -62,10 +62,10 @@
try {
setup();
if (doTest("java:comp/env/jms/MsgBeanQueue", numMessages)) {
- stat.addStatus("cmt main", stat.PASS);
- } else {
- stat.addStatus("cmt main", stat.FAIL);
- }
+ stat.addStatus("cmt main", stat.PASS);
+ } else {
+ stat.addStatus("cmt main", stat.FAIL);
+ }
} catch(Throwable t) {
stat.addStatus("cmt main", stat.FAIL);
t.printStackTrace();
@@ -76,18 +76,18 @@
public void setup() throws Exception {
context = new InitialContext();
-
- QueueConnectionFactory queueConFactory =
+
+ QueueConnectionFactory queueConFactory =
(QueueConnectionFactory) context.lookup
("java:comp/env/FooCF");
-
+
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
clientQueue = (jakarta.jms.Queue)
context.lookup("java:comp/env/jms/MsgBeanClientQueue");
@@ -108,18 +108,18 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
- System.out.println("Sending message " + i + " to " + queue +
+ System.out.println("Sending message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
queueSender.send(queue, msg);
- System.out.println("Sent message " + i + " to " + queue +
+ System.out.println("Sent message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
}
}
- public boolean doTest(String destName, int num)
+ public boolean doTest(String destName, int num)
throws Exception {
Destination dest = (Destination) context.lookup(destName);
@@ -133,9 +133,9 @@
System.out.println("Waiting for queue message");
Message recvdmessage = queueReceiver.receive(TIMEOUT);
if( recvdmessage != null ) {
- String receivedMsg = ((TextMessage)recvdmessage).getText();
+ String receivedMsg = ((TextMessage)recvdmessage).getText();
System.out.println("Received message : " + receivedMsg);
- return receivedMsg.equals("mdb() invoked. Interceptor count: 1");
+ return receivedMsg.equals("mdb() invoked. Interceptor count: 1");
} else {
System.out.println("timeout after " + TIMEOUT + " seconds");
throw new JMSException("timeout" + TIMEOUT + " seconds");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/BaseInterceptor.java
index a754cc8..c3fe88b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/BaseInterceptor.java
@@ -24,16 +24,16 @@
private static int interceptorCount = 0 ;
static int getCount() {
- return interceptorCount;
+ return interceptorCount;
}
@AroundInvoke
public Object intercept(InvocationContext inv)
- throws Exception
+ throws Exception
{
- System.out.println("[mdb] Interceptor invoked...");
- interceptorCount++;
- return inv.proceed();
+ System.out.println("[mdb] Interceptor invoked...");
+ interceptorCount++;
+ return inv.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/Hello1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/Hello1.java
index 3094bfd..4e84a97 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/Hello1.java
@@ -19,5 +19,5 @@
public interface Hello1 {
public void hello(String s);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java
index 236d28a..b338f58 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java
@@ -37,7 +37,7 @@
msg);
}
@PreDestroy public void myPreDestroyMethod() {
- System.out.println("PRE-DESTROY callback received in " + msg);
+ System.out.println("PRE-DESTROY callback received in " + msg);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
index b4de9ed..7b426fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
@@ -50,7 +50,7 @@
QueueConnection connection = null;
try {
-
+
System.out.println("Calling hello1 stateless bean");
hello1.hello("local ejb3.0 stateless");
System.out.println("Calling hello2 stateful bean");
@@ -75,7 +75,7 @@
QueueSender sender = session.createSender(queue);
TextMessage tmessage = session.createTextMessage();
tmessage.setText("mdb() invoked. Interceptor count: "
- + BaseInterceptor.getCount());
+ + BaseInterceptor.getCount());
System.out.println("Sending message");
sender.send(tmessage);
System.out.println("message sent");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.properties
index 3018ec7..e2ca75c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-interceptors-session"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.xml
index 617dc97..3eeaa1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Exception.class,**/*Interceptor*.class,**/Dummy*.class,**/Sless*.class,**/Sful*.class,**/*Foo.class, **/Bar*.class,**/ArgumentsVerifier.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/*Exception.class,**/AssertionFailedException.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java
index 3884711..c02facc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,11 +34,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-interceptors-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB Sful sful;
private static @EJB Sful sful0;
@@ -53,14 +53,14 @@
private static @EJB Sful sful9;
public void doTest() {
- doTest1();
- doTest2();
- doTest3();
- doTest4();
- doTest5();
- doTest6();
+ doTest1();
+ doTest2();
+ doTest3();
+ doTest4();
+ doTest5();
+ doTest6();
- doTest7_8();
+ doTest7_8();
doTest9();
doTest10();
@@ -71,9 +71,9 @@
System.out.println("invoking stateful");
sful.hello();
- System.out.println("+++++++++++++++++++++++++++++++++++++++");
- System.out.println("+++++ InterceptorCallCount: " + sful.getCount());
- System.out.println("+++++++++++++++++++++++++++++++++++++++");
+ System.out.println("+++++++++++++++++++++++++++++++++++++++");
+ System.out.println("+++++ InterceptorCallCount: " + sful.getCount());
+ System.out.println("+++++++++++++++++++++++++++++++++++++++");
stat.addStatus("local test1" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
@@ -86,8 +86,8 @@
sful.throwAppException("XYZ");
stat.addStatus("local test2" , stat.FAIL);
} catch (AppException appEx) {
- System.out.println("Got expected AppException: " + appEx);
- stat.addStatus("local test2" , stat.PASS);
+ System.out.println("Got expected AppException: " + appEx);
+ stat.addStatus("local test2" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("local test2" , stat.FAIL);
@@ -97,10 +97,10 @@
private void doTest3() {
try {
String result = sful.computeMid(4, 10);
- System.out.println("[Test3]: Got: " + result);
+ System.out.println("[Test3]: Got: " + result);
stat.addStatus("local test3" , stat.PASS);
} catch (SwapArgumentsException swapEx) {
- System.out.println("Got unexpected Exception: " + swapEx);
+ System.out.println("Got unexpected Exception: " + swapEx);
stat.addStatus("local test3" , stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
@@ -111,11 +111,11 @@
private void doTest4() {
try {
String result = sful.computeMid(23, 10);
- System.out.println("[Test4]: Got: " + result
- + " INSTEAD of SwapArgumentsException");
+ System.out.println("[Test4]: Got: " + result
+ + " INSTEAD of SwapArgumentsException");
stat.addStatus("local test4" , stat.FAIL);
} catch (SwapArgumentsException swapEx) {
- System.out.println("Got expected Exception: " + swapEx);
+ System.out.println("Got expected Exception: " + swapEx);
stat.addStatus("local test4" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
@@ -126,11 +126,11 @@
private void doTest5() {
try {
String result = sful.callDummy();
- System.out.println("[Test5]: Got: " + result
- + " INSTEAD of CallBlockedException");
+ System.out.println("[Test5]: Got: " + result
+ + " INSTEAD of CallBlockedException");
stat.addStatus("local test5" , stat.FAIL);
} catch (CallBlockedException callBlkEx) {
- System.out.println("Got expected Exception: " + callBlkEx);
+ System.out.println("Got expected Exception: " + callBlkEx);
stat.addStatus("local test5" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
@@ -143,7 +143,7 @@
sful.eatException();
stat.addStatus("local test6" , stat.PASS);
} catch(Exception e) {
- System.out.println("Got unexpected Exception: " + e);
+ System.out.println("Got unexpected Exception: " + e);
e.printStackTrace();
stat.addStatus("local test6" , stat.FAIL);
}
@@ -151,40 +151,40 @@
private void doTest7_8() {
try {
- int sz = 20;
+ int sz = 20;
Context ctx = new InitialContext();
- sful.resetLifecycleCallbackCounters();
- Sful[] sfuls = new Sful[sz];
- for (int i=0; i<sz; i++) {
- sfuls[i] = (Sful) ctx.lookup("com.sun.s1asdev.ejb.ejb30.interceptors.session.Sful");
- int prevIndex = (i ==0) ? 0 : i-1;
- System.out.println("Created sful["+i+"]: " + sfuls[i] + " ==> "
- + sfuls[prevIndex].equals(sfuls[i]));
- sfuls[i].setID(i);
+ sful.resetLifecycleCallbackCounters();
+ Sful[] sfuls = new Sful[sz];
+ for (int i=0; i<sz; i++) {
+ sfuls[i] = (Sful) ctx.lookup("com.sun.s1asdev.ejb.ejb30.interceptors.session.Sful");
+ int prevIndex = (i ==0) ? 0 : i-1;
+ System.out.println("Created sful["+i+"]: " + sfuls[i] + " ==> "
+ + sfuls[prevIndex].equals(sfuls[i]));
+ sfuls[i].setID(i);
sfuls[i].getCount();
- }
- sleepFor(10);
- for (int i=0; i<sz; i++) {
- sfuls[i].getCount();
- }
- int passivationCount = sful.getPrePassivateCallbackCount();
- int activationCount = sful.getPostActivateCallbackCount();
-
+ }
+ sleepFor(10);
+ for (int i=0; i<sz; i++) {
+ sfuls[i].getCount();
+ }
+ int passivationCount = sful.getPrePassivateCallbackCount();
+ int activationCount = sful.getPostActivateCallbackCount();
+
boolean status = (passivationCount > 0) && (activationCount> 0);
System.out.println("passivation: " + passivationCount + "; "
- + "activation: " + activationCount);
- stat.addStatus("local test7" ,
- (status == true) ? stat.PASS : stat.FAIL);
-
+ + "activation: " + activationCount);
+ stat.addStatus("local test7" ,
+ (status == true) ? stat.PASS : stat.FAIL);
+
boolean stateRestored = true;
for (int i=0; i<sz; i++) {
boolean ok = sfuls[i].isStateRestored();
System.out.println("stateRestored[" + i + "]:" + ok);
stateRestored = ok && status;
}
- stat.addStatus("local test8" ,
+ stat.addStatus("local test8" ,
(stateRestored == true) ? stat.PASS : stat.FAIL);
-
+
} catch(Exception e) {
System.out.println("Got unexpected Exception: " + e);
e.printStackTrace();
@@ -199,7 +199,7 @@
System.out.println("Test[" + testName + "]: " + map.get(testName));
checkSetParamsStatus = checkSetParamsStatus && map.get(testName);
}
- stat.addStatus("local test9" ,
+ stat.addStatus("local test9" ,
(checkSetParamsStatus == true) ? stat.PASS : stat.FAIL);
}
@@ -221,18 +221,18 @@
failedCountStatus = false;
}
- stat.addStatus("local test10 " + trueStatus + " : " + sful.getAssertionFailedCount() ,
+ stat.addStatus("local test10 " + trueStatus + " : " + sful.getAssertionFailedCount() ,
((trueStatus && failedCountStatus) == true) ? stat.PASS : stat.FAIL);
}
private static void sleepFor(int seconds) {
- while (seconds-- > 0) {
- try {
- System.out.println("" + seconds + " left...");
- Thread.currentThread().sleep(1000);
- } catch (InterruptedException inEx) {
- }
- }
+ while (seconds-- > 0) {
+ try {
+ System.out.println("" + seconds + " left...");
+ Thread.currentThread().sleep(1000);
+ } catch (InterruptedException inEx) {
+ }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/descriptor/sun-ejb-jar.xml
index 9bc87c7..c0b7e7c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/descriptor/sun-ejb-jar.xml
@@ -24,7 +24,7 @@
<ejb-name>SfulEJB</ejb-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>2</resize-quantity>
+ <resize-quantity>2</resize-quantity>
</bean-cache>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ArgumentsVerifier.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ArgumentsVerifier.java
index efa2f8d..8052ed0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ArgumentsVerifier.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ArgumentsVerifier.java
@@ -25,7 +25,7 @@
@AroundInvoke
public Object interceptCall(InvocationContext ctx)
- throws MyBadException, Exception
+ throws MyBadException, Exception
{
Method method = ctx.getMethod();
String methodName = method.getName();
@@ -51,7 +51,7 @@
params[0] = new Long(45);
} else if (methodName.equals("objectArgs")) {
params = new Object[0];
- }
+ }
try {
ctx.setParameters(params);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
index b0a93ea..d2ecde7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
@@ -44,11 +44,11 @@
@AroundInvoke
public Object interceptCall(InvocationContext ctx)
- throws Exception
+ throws Exception
{
Object result = null;
- boolean setId = false;
- baseCount++;
+ boolean setId = false;
+ baseCount++;
if (ctx.getMethod().getName().equals("setInterceptorId")) {
java.util.Map map = ctx.getContextData();
map.put("BaseInterceptor", this);
@@ -65,26 +65,26 @@
}
public static int getInvocationCount() {
- return baseCount;
+ return baseCount;
}
-
+
@PrePassivate
public void prePassivate(InvocationContext ctx) {
- prePassivateCount++;
- System.out.println("prePassivateCount: " + prePassivateCount);
+ prePassivateCount++;
+ System.out.println("prePassivateCount: " + prePassivateCount);
}
@PostActivate
public void postActivate(InvocationContext ctx) {
- postActivateCount++;
- System.out.println("postActivateCount: " + postActivateCount);
+ postActivateCount++;
+ System.out.println("postActivateCount: " + postActivateCount);
}
-
+
//Some package private methods to check state
void setInterceptorID(int val) {
this.interceptorID = val;
}
-
+
int getInterceptorID() {
boolean valid = (computedInterceptorID == interceptorID * 2 + 1);
if (! valid) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BlockingInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BlockingInterceptor.java
index e480182..dfaae8a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BlockingInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BlockingInterceptor.java
@@ -29,7 +29,7 @@
private void afterCreation(InvocationContext ctx) {
String value = (String) ctx.getContextData().get("PostConstruct");
- System.out.println("In BlockingInterceptor.afterCreation value = "
+ System.out.println("In BlockingInterceptor.afterCreation value = "
+ value);
if(value == null) {
throw new IllegalStateException("BaseInterceptor.PostConstruct " +
@@ -44,12 +44,12 @@
@AroundInvoke
private Object interceptCall(InvocationContext ctx)
- throws CallBlockedException
+ throws CallBlockedException
{
- System.out.println("[test.BlockingInterceptor @AroundInvoke]: " + ctx.getMethod());
- blockCount++;
- throw new CallBlockedException("Call blocked");
+ System.out.println("[test.BlockingInterceptor @AroundInvoke]: " + ctx.getMethod());
+ blockCount++;
+ throw new CallBlockedException("Call blocked");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Dummy.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Dummy.java
index f44746d..d486192 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Dummy.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Dummy.java
@@ -20,7 +20,7 @@
public interface Dummy
{
public String dummy()
- throws CallBlockedException;
+ throws CallBlockedException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
index 826e81d..a3d4474 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
@@ -24,17 +24,17 @@
import jakarta.annotation.PostConstruct;
@Interceptors({
- com.sun.s1asdev.ejb.ejb30.interceptors.session.BaseInterceptor.class,
- com.sun.s1asdev.ejb.ejb30.interceptors.session.BlockingInterceptor.class
+ com.sun.s1asdev.ejb.ejb30.interceptors.session.BaseInterceptor.class,
+ com.sun.s1asdev.ejb.ejb30.interceptors.session.BlockingInterceptor.class
})
@Stateless
public class DummyEJB
- implements Dummy
+ implements Dummy
{
int interceptorId;
private boolean createCalled = false;
-
+
@PostConstruct
private void afterCreate()
{
@@ -43,9 +43,9 @@
}
public String dummy()
- throws CallBlockedException
+ throws CallBlockedException
{
- return "Dummy!!";
+ return "Dummy!!";
}
public void setInterceptorId(int val) {
@@ -55,10 +55,10 @@
this.interceptorId = val;
}
-
+
@AroundInvoke
private Object interceptCall(InvocationContext ctx)
- throws Exception {
+ throws Exception {
return ctx.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
index 38338af..a939716 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
@@ -32,11 +32,11 @@
@AroundInvoke
public Object interceptCall(InvocationContext ctx)
- throws MyBadException, AssertionFailedException, Exception
+ throws MyBadException, AssertionFailedException, Exception
{
- System.out.println("In ErrorREcoveryInterceptor");
- System.out.println("sless = " + foobar);
- System.out.println("sc = " + sc);
+ System.out.println("In ErrorREcoveryInterceptor");
+ System.out.println("sless = " + foobar);
+ System.out.println("sc = " + sc);
Method method = ctx.getMethod();
String methodName = method.getName();
@@ -46,7 +46,7 @@
if (methodName.equals("assertIfTrue")) {
params[0] = new Boolean(false);
-
+
try {
ctx.setParameters(params);
} catch (IllegalArgumentException illArgEx) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
index df8131a..ba05722 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
@@ -29,7 +29,7 @@
private static int prePassivateCallbackCount = 0;
private static int postActivateCallbackCount = 0;
-
+
private int interceptorID;
private int computedInterceptorID;
@@ -38,21 +38,21 @@
@PrePassivate
void prePassivate(InvocationContext ctx) {
- prePassivateCallbackCount++;
+ prePassivateCallbackCount++;
}
@PostActivate
private void postActivate(InvocationContext ctx) {
- postActivateCallbackCount++;
+ postActivateCallbackCount++;
}
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
- System.out.println("In LifecycleCallbackInterceptor:aroundInvoke()");
- sless.sayHello();
- System.out.println("caller principal = " + sessionCtx.getCallerPrincipal());
+ System.out.println("In LifecycleCallbackInterceptor:aroundInvoke()");
+ sless.sayHello();
+ System.out.println("caller principal = " + sessionCtx.getCallerPrincipal());
if (ctx.getMethod().getName().equals("setID")) {
ctx.getContextData().put("LifecycleCallbackInterceptor", this);
@@ -65,30 +65,30 @@
}
public static void resetLifecycleCallbackCounters() {
- prePassivateCallbackCount = postActivateCallbackCount = 0;
+ prePassivateCallbackCount = postActivateCallbackCount = 0;
}
public static int getPrePassivateCallbackCount() {
- return prePassivateCallbackCount;
+ return prePassivateCallbackCount;
}
public static int getPostActivateCallbackCount() {
- return postActivateCallbackCount;
+ return postActivateCallbackCount;
}
-
+
void setInterceptorID(int val) {
this.interceptorID = val;
this.computedInterceptorID = 2 * val + 1;
}
-
+
int getInterceptorID() {
return interceptorID;
}
-
+
boolean checkInterceptorID(int val) {
- return (val == interceptorID) &&
+ return (val == interceptorID) &&
(computedInterceptorID == 2 * val + 1);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java
index d270375..906de23 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java
@@ -27,17 +27,17 @@
public String hello();
public int getCount();
-
+
public void throwAppException(String msg)
throws AppException;
public String computeMid(int min, int max)
- throws SwapArgumentsException;
+ throws SwapArgumentsException;
public String callDummy()
- throws Exception;
+ throws Exception;
- public String eatException()
+ public String eatException()
throws EatException;
public void resetLifecycleCallbackCounters();
@@ -45,9 +45,9 @@
public int getPrePassivateCallbackCount();
public int getPostActivateCallbackCount();
-
+
public void setID(int val);
-
+
public boolean isStateRestored();
public Map<String, Boolean> checkSetParams();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
index 4381fea..b970a4f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
@@ -41,7 +41,7 @@
@EJB(name="foobar") Sless foobar;
private int count = 0;
-
+
private int id;
private LifecycleCallbackInterceptor interceptor;
@@ -52,17 +52,17 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
- sless.sayHello();
- System.out.println("caller principal = " + sc.getCallerPrincipal());
+ sless.sayHello();
+ System.out.println("caller principal = " + sc.getCallerPrincipal());
return "hello";
}
@AroundInvoke
private Object interceptCall(InvocationContext ctx)
- throws Exception
+ throws Exception
{
- System.out.println("**Beans AROUNDINVOKE++ [@AroundInvoke]: " + ctx.getMethod());
- count++;
+ System.out.println("**Beans AROUNDINVOKE++ [@AroundInvoke]: " + ctx.getMethod());
+ count++;
try {
if (ctx.getMethod().getName().equals("setID")) {
java.util.Map map = ctx.getContextData();
@@ -75,9 +75,9 @@
}
public int getCount() {
- return count;
+ return count;
}
-
+
public void throwAppException(String msg)
throws AppException
{
@@ -85,17 +85,17 @@
}
public String computeMid(int min, int max)
- throws SwapArgumentsException
+ throws SwapArgumentsException
{
- return sless.sayHello()
- + ", Midpoint of " + min + ", " + max + "; "
- + sless.computeMidPoint(min, max);
+ return sless.sayHello()
+ + ", Midpoint of " + min + ", " + max + "; "
+ + sless.computeMidPoint(min, max);
}
public String callDummy()
- throws Exception
+ throws Exception
{
- return dummy.dummy();
+ return dummy.dummy();
}
public String eatException()
@@ -106,22 +106,22 @@
}
public int getPrePassivateCallbackCount() {
- return LifecycleCallbackInterceptor.getPrePassivateCallbackCount();
+ return LifecycleCallbackInterceptor.getPrePassivateCallbackCount();
}
public int getPostActivateCallbackCount() {
- return LifecycleCallbackInterceptor.getPostActivateCallbackCount();
+ return LifecycleCallbackInterceptor.getPostActivateCallbackCount();
}
public void resetLifecycleCallbackCounters() {
- LifecycleCallbackInterceptor.resetLifecycleCallbackCounters();
+ LifecycleCallbackInterceptor.resetLifecycleCallbackCounters();
}
public void setID(int val) {
this.id = val;
interceptor.setInterceptorID(val);
}
-
+
public boolean isStateRestored() {
return interceptor.checkInterceptorID(id);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java
index c8be6ec..9044f86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java
@@ -24,7 +24,7 @@
public String sayHello();
public double computeMidPoint(int min, int max)
- throws SwapArgumentsException;
+ throws SwapArgumentsException;
public void setFoo(Foo foo)
throws MyBadException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
index 613e54a..52d4b62 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
@@ -23,19 +23,19 @@
//Default is @Local
@Stateless
public class SlessEJB
- implements Sless
+ implements Sless
{
public String sayHello() {
- return "Hello";
+ return "Hello";
}
public double computeMidPoint(int min, int max)
- throws SwapArgumentsException
+ throws SwapArgumentsException
{
- if (min > max) {
- throw new SwapArgumentsException("("+min+", "+max+")");
- }
- return (min*1.0+max)/2.0;
+ if (min > max) {
+ throw new SwapArgumentsException("("+min+", "+max+")");
+ }
+ return (min*1.0+max)/2.0;
}
@Interceptors(ArgumentsVerifier.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.properties
index 0cac325..4521380 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="devtest-intro-multi"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.xml
index f2299cd..ac24b0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sless.class,**/Sless30.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java
index f75621c..0304a0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java
@@ -27,7 +27,7 @@
@EJB(name="ejb/GG", beanInterface=Sless.class)
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -36,11 +36,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-allowed-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
(new MyThread()).start();
@@ -50,7 +50,7 @@
(new MyThread()).start();
(new MyThread()).start();
stat.addStatus("intro sayHello", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("intro sayHello", stat.FAIL);
}
@@ -59,7 +59,7 @@
private static class MyThread extends Thread {
MyThread() {}
-
+
public void run() {
try {
(new InitialContext()).lookup("java:comp/env/ejb/GG");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java
index 2d38653..e158184 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java
@@ -37,11 +37,11 @@
}
public String sayHello() {
- return "Hello";
+ return "Hello";
}
public boolean wasEjbCreateCalled() {
- return ejbCreateCalled;
+ return ejbCreateCalled;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java
index ee39cd2..c528f19 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java
@@ -32,11 +32,11 @@
}
public String sayHello() {
- return "Hello";
+ return "Hello";
}
public boolean wasEjbCreateCalled() {
- return ejbCreateCalled;
+ return ejbCreateCalled;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.properties
index 19d47a0..101b6b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="devtest-intro-stateless"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.xml
index 782b0bc..9a03d48 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sless.class,**/Sless30.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java
index da47a87..785c815 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java
@@ -27,7 +27,7 @@
@EJB(name="ejb/GG", beanInterface=Sless.class)
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -36,11 +36,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-allowed-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB(name="ejb/kk") Sless sless;
private static @EJB Sless30 sless30;
@@ -49,39 +49,39 @@
public void doTest() {
try {
(new InitialContext()).lookup("java:comp/env/ejb/GG");
- sless.sayHello();
+ sless.sayHello();
stat.addStatus("intro sayHello", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("intro sayHello", stat.FAIL);
}
- boolean result = false;
+ boolean result = false;
try {
- result = sless.wasEjbCreateCalled();
+ result = sless.wasEjbCreateCalled();
stat.addStatus("intro wasEjbCreateCalled",
result ? stat.PASS : stat.FAIL);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("intro wasEjbCreateCalled", stat.FAIL);
- }
+ }
try {
- sless30.sayHello();
+ sless30.sayHello();
stat.addStatus("intro sayHello30", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("intro sayHello30", stat.FAIL);
}
- result = false;
+ result = false;
try {
- result = sless30.wasEjbCreateCalled();
+ result = sless30.wasEjbCreateCalled();
stat.addStatus("intro wasEjbCreateCalled30",
(result == false) ? stat.PASS : stat.FAIL);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("intro wasEjbCreateCalled30", stat.FAIL);
- }
+ }
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java
index 2d38653..e158184 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java
@@ -37,11 +37,11 @@
}
public String sayHello() {
- return "Hello";
+ return "Hello";
}
public boolean wasEjbCreateCalled() {
- return ejbCreateCalled;
+ return ejbCreateCalled;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java
index ee39cd2..c528f19 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java
@@ -32,11 +32,11 @@
}
public String sayHello() {
- return "Hello";
+ return "Hello";
}
public boolean wasEjbCreateCalled() {
- return ejbCreateCalled;
+ return ejbCreateCalled;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/build.xml
index b3bd8ff..62a3c68 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/build.xml
@@ -88,9 +88,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb30-persistence tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb30-persistence tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.properties
index 2757b1a..a85f883 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-context"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.xml
index b61d947..e33f64a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,10 +58,10 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
@@ -72,9 +72,9 @@
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sless.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -82,9 +82,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar, lib/${appname}-par2.jar, lib/${appname}-par3.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -92,10 +92,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java
index ed3c2b3..9fed4ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java
@@ -24,7 +24,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private String personName;
@@ -35,8 +35,8 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-persistence-contextID");
- }
-
+ }
+
public Client (String[] args) {
personName = "duke";
@@ -46,7 +46,7 @@
}
}
-
+
private static @EJB Sless sless;
public void doTest() {
@@ -84,8 +84,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Person.java
index 0f6c7ec..34d4708 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Person.java
@@ -35,7 +35,7 @@
public Person(String name){
this.name = name;
}
-
+
@Override public String toString(){
return "Person: {"+"(name = "+name+")}";
}
@@ -44,4 +44,4 @@
return name;
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
index 4abbdd6..e7dff8c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
@@ -36,11 +36,11 @@
private @PersistenceContext(unitName="em2") EntityManager emRemove;
public void createPerson(String name) {
-
+
Person p = new Person(name);
boolean containsP = emCreate.contains(p);
- System.out.println("before persist containsP = " + containsP);
+ System.out.println("before persist containsP = " + containsP);
if( containsP ) {
throw new EJBException("contains() should be false");
}
@@ -63,7 +63,7 @@
"when calling close() on a container-managed " +
"EntityManager");
}
-
+
// isOpen doesn't make any sense on a container-managed entity manager,
// but it shouldn't throw an exception.
emCreate.isOpen();
@@ -115,8 +115,8 @@
if( results3.size() != 1) {
throw new EJBException("wrong num results");
}
-
-
+
+
}
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
@@ -133,7 +133,7 @@
}
System.out.println("Getting q1 from EM");
- Query q1 = emFind.createQuery("SELECT OBJECT(p) FROM Person p WHERE p.name='" + name + "'");
+ Query q1 = emFind.createQuery("SELECT OBJECT(p) FROM Person p WHERE p.name='" + name + "'");
System.out.println("Executing q1");
Person p3 = (Person) q1.getSingleResult();
@@ -159,7 +159,7 @@
System.out.println("Getting q2 from EM");
- Query q2 = emFind.createQuery("SELECT OBJECT(p) FROM Person p WHERE p.name='" + name + "'");
+ Query q2 = emFind.createQuery("SELECT OBJECT(p) FROM Person p WHERE p.name='" + name + "'");
try {
q2.setFirstResult(-1);
@@ -218,7 +218,7 @@
System.out.println("Got expected TransactionRequiredException " +
"when calling merge outside a transaction");
}
-
+
try {
emFind.remove(p);
throw new EJBException("remove should have thrown an exception");
@@ -266,7 +266,7 @@
if( !name.equals(p8.getName()) ) {
throw new EJBException("finder results not equivalent");
}
-
+
Query q4 = emFind.createNativeQuery("SELECT p.name FROM EJB30_PERSISTENCE_CONTEXT_PERSON p WHERE p.name LIKE '" + name + "'");
String p9 = (String) q4.getSingleResult(); // ((Vector) q4.getSingleResult()).elementAt(0);
System.out.println("Found " + p9);
@@ -279,7 +279,7 @@
if( !name.equals(p10) ) {
throw new EJBException("finder results not equivalent");
}
-
+
Query q5 = emFind.createNativeQuery("SELECT p.name FROM EJB30_PERSISTENCE_CONTEXT_PERSON p WHERE p.name LIKE '" + name + "'", Person.class);
Person p11 = (Person) q5.getSingleResult();
@@ -296,7 +296,7 @@
}
Query q6 = emFind.createNativeQuery("SELECT p.name FROM EJB30_PERSISTENCE_CONTEXT_PERSON p WHERE p.name LIKE '" + name + "'", "PersonSqlMapping");
-
+
Person p13 = (Person) q6.getSingleResult();
System.out.println("Found " + p13);
if( !name.equals(p13.getName()) ) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.properties
index cad5d73..773b838 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eem_1slsb_2sfsbs"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.xml
index b279f33..5bc287b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java
index 4208da2..41baec0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java
@@ -53,14 +53,14 @@
public void doTest() {
try {
-
+
System.out.println("I am in client");
System.out.println("calling createPerson(" + personName + ")");
sful.setName(personName);
System.out.println("created ");
-
+
Map<String, Boolean> map = sful.doTests();
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -73,7 +73,7 @@
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Person.java
index f05f5b2..4a2ca89 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Person.java
@@ -46,7 +46,7 @@
return data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
index 3dd92ff..78ed30b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
@@ -34,27 +34,27 @@
import jakarta.ejb.EJBException;
@Stateful
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs.SfulDelegate.class)
public class SfulBean
implements Sful {
private String name;
-
+
private @EJB SfulDelegate delegate;
private @EJB Sless sless;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-eem_1slsb_2sfsbs-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
public void setName(String name) {
this.name = name;
try {
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
} catch (Exception ex) {
@@ -64,7 +64,7 @@
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
@@ -101,7 +101,7 @@
peerOpStatus = true;
}
map.put("peerFoundMe (-ve test)", peerOpStatus);
-
+
map.put("delegateRemovedMe",
delegate.remove(name));
@@ -115,7 +115,7 @@
map.put("iCannotFindMe (-ve test)",
(find(name) == null));
-
+
map.put("removedDelegate",
removePerson(delegateName));
@@ -126,7 +126,7 @@
peerOpStatus = true;
}
map.put("peerCannotfindDelegate (-ve test)", peerOpStatus);
-
+
String peerName = "_peer_name_" + name;
String peerData = "_peer_data_" + name;
@@ -164,5 +164,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
index 361c2a1..f59e8bd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
SfulPeer getSfulPeer();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
index fcf2f1c..174def8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
@@ -41,11 +41,11 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name, data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
index c43f287..be2b057 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
index d1f6407..1b9dda2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
@@ -37,11 +37,11 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name, data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/create.sql
index 6d6ced3..a1761ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEM_1SLSB_2SFSBS_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEM_1SLSB_2SFSBS_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/drop.sql
index 8c9e5c4..9c23a5b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEM_1SLSB_2SFSBS_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEM_1SLSB_2SFSBS_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.properties
index f51cf6e..0777762 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eem_3sfsbs"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.xml
index a1e78c3..555ef8c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java
index 498fc5e..71c73b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java
@@ -53,14 +53,14 @@
public void doTest() {
try {
-
+
System.out.println("I am in client");
System.out.println("calling createPerson(" + personName + ")");
sful.setName(personName);
System.out.println("created ");
-
+
Map<String, Boolean> map = sful.doTests();
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -73,7 +73,7 @@
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Person.java
index 3c2958e..e2cf0c6a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Person.java
@@ -42,7 +42,7 @@
this.data = data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
index 7a5dab9..f9bc3a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
@@ -34,25 +34,25 @@
import jakarta.ejb.EJBException;
@Stateful
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs.SfulDelegate.class)
public class SfulBean
implements Sful {
private String name;
-
+
private @EJB SfulDelegate delegate;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-eem_3sfsbs-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
public void setName(String name) {
this.name = name;
try {
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
@@ -88,7 +88,7 @@
map.put("peerFoundMe",
(peer.find(name) != null));
-
+
map.put("delegateRemovedMe",
delegate.remove(name));
@@ -97,13 +97,13 @@
map.put("iCannotFindMe (-ve test)",
(find(name) == null));
-
+
map.put("removedDelegate",
removePerson(delegateName));
map.put("peerCannotfindDelegate (-ve test)",
(! peer.remove(delegateName)));
-
+
String peerName = "_peer_name_" + name;
String peerData = "_peer_data_" + name;
@@ -136,5 +136,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
index 0f45807..77a045c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
SfulPeer getSfulPeer();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
index 7cb3711..8ef4515 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
@@ -41,11 +41,11 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name, data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
index ae051d5..b19bcdb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
index 6678ac9..8247fc6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
@@ -37,11 +37,11 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name, data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/create.sql
index f829e56..809c5ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEM_3SFSBS_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEM_3SFSBS_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/drop.sql
index 0ac83c2..6ff570c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEM_3SFSBS_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEM_3SFSBS_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.properties
index 892e294..ba1f51b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eem_adapted"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.xml
index 68fc9ad..e351ea5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class, **/AdaptedLocalHome.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java
index 440ace1..e1136c9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java
@@ -53,13 +53,13 @@
public void doTest() {
try {
-
+
System.out.println("I am in client");
System.out.println("calling setName(" + personName + ")");
sful.setName(personName);
-
+
Map<String, Boolean> map = sful.doTests();
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -72,7 +72,7 @@
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Person.java
index 7603c7d..6fbcbd1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Person.java
@@ -42,7 +42,7 @@
this.data = data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
index c4fe546..83ca2ad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
@@ -40,22 +40,22 @@
implements Sful {
private String name;
-
+
@EJB private AdaptedLocalHome home;
private SfulDelegate delegate;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-eem_adapted-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
public void setName(String name) {
this.name = name;
}
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
try {
@@ -69,11 +69,11 @@
extendedEM.persist(person);
Person foundPerson = delegate.find(name);
-
+
boolean delegateRemovedMe = delegate.remove(name);
-
+
boolean removedDelegate = removePerson(delegateName);
-
+
Map<String, Boolean> map = new HashMap<String, Boolean>();
map.put("findDelegateCreatedPerson", (dPerson != null));
map.put("delegateFoundMe", (foundPerson != null));
@@ -101,5 +101,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
index e2cd88f..acc5ef5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
@@ -30,7 +30,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
index f258617..100ef6a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
@@ -43,7 +43,7 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
@Init
public void createDelegate(String name, String data) {
}
@@ -55,7 +55,7 @@
public Person createPerson(String name, String data) {
Person person = new Person(name, data);
-
+
extendedEM.persist(person);
return person;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/create.sql
index 61842f1..85a8db0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEM_ADAPTED_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEM_ADAPTED_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/drop.sql
index fdc9128..769dd38 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEM_ADAPTED_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEM_ADAPTED_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.properties
index 38eea69..6efb31e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eem_injection"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.xml
index fe7c637..5209b84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java
index eae50e7..bedb576 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java
@@ -53,14 +53,14 @@
public void doTest() {
try {
-
+
System.out.println("I am in client");
System.out.println("calling createPerson(" + personName + ")");
sful.setName(personName);
System.out.println("created ");
-
+
Map<String, Boolean> map = sful.doTests();
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -73,7 +73,7 @@
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Person.java
index 683f5a3..6a95f84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Person.java
@@ -45,7 +45,7 @@
this.data = data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
index 8eef986..a08e9c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
@@ -34,25 +34,25 @@
import jakarta.ejb.EJBException;
@Stateful
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.eem_injection.SfulDelegate.class)
public class SfulBean
implements Sful {
private String name;
-
+
private @EJB SfulDelegate delegate;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-eem_injection-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
public void setName(String name) {
this.name = name;
try {
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
delegate.create(delegateName, delegateData);
@@ -71,11 +71,11 @@
extendedEM.persist(person);
Person foundPerson = delegate.find(name);
-
+
boolean delegateRemovedMe = delegate.remove(name);
-
+
boolean removedDelegate = removePerson(delegateName);
-
+
Map<String, Boolean> map = new HashMap<String, Boolean>();
map.put("findDelegateCreatedPerson", (dPerson != null));
map.put("delegateFoundMe", (foundPerson != null));
@@ -103,5 +103,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
index 5b72c73..6728f8e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
index 52f920c..f490a19 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
@@ -37,12 +37,12 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name);
p.setData(data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/create.sql
index fa60742..c0ab43f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/drop.sql
index 5eb136f..d012c69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.properties
index cc38ebe..b72a791 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eempassivation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.xml
index 8ed4406..45774a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java
index 7ae4482..d00bbcb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java
@@ -26,7 +26,7 @@
void setName(String name);
Map<String, Boolean> doTests(String prefix);
-
+
public void createSfulDelegates();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
index 43eca90..ae96205 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
@@ -50,7 +50,7 @@
String lookupName = "java:comp/env/ejb/SfulBean";
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
-
+
System.out.println("**EEM Delegate: " + extendedEM.getDelegate().getClass().getName());
} catch (Exception ex) {
throw new EJBException(ex);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
index 8766ec9..e6696ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
@@ -93,7 +93,7 @@
System.out.println("**ejbPASSIVATE() called...");
passivationCount++;
}
-
+
@PostActivate
public void postActivate() {
System.out.println("**ejbActivate() called...");
@@ -103,7 +103,7 @@
public int getPassivationCount() {
return passivationCount;
}
-
+
public int getActivationCount() {
return activateCount;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/create.sql
index 7985340..0bb6bbd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/drop.sql
index 6d8c67f..36675ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.properties
index 98d78cc..3f79079 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eempropagation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.xml
index 69be37c..efbdf5d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java
index 335a623..c706d19 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java
@@ -53,14 +53,14 @@
public void doTest() {
try {
-
+
System.out.println("I am in client");
System.out.println("calling createPerson(" + personName + ")");
sful.setName(personName);
System.out.println("created ");
-
+
Map<String, Boolean> map = sful.doTests();
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -73,7 +73,7 @@
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Person.java
index 4c166d5..2a0eff2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Person.java
@@ -42,7 +42,7 @@
this.data = data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
index 06e2cb5..9ad16e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
@@ -34,27 +34,27 @@
import jakarta.ejb.EJBException;
@Stateful
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.eempropagation.SfulDelegate.class)
public class SfulBean
implements Sful {
private String name;
-
+
//private @EJB SfulDelegate delegate;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-eempropagation-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
private SfulDelegate delegate;
public void setName(String name) {
this.name = name;
try {
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
} catch (Exception ex) {
@@ -64,7 +64,7 @@
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
delegate.create(delegateName, delegateData);
@@ -73,11 +73,11 @@
extendedEM.persist(person);
Person foundPerson = delegate.find(name);
-
+
boolean delegateRemovedMe = delegate.remove(name);
-
+
boolean removedDelegate = removePerson(delegateName);
-
+
Map<String, Boolean> map = new HashMap<String, Boolean>();
map.put("findDelegateCreatedPerson", (dPerson != null));
map.put("delegateFoundMe", (foundPerson != null));
@@ -105,5 +105,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
index e3292ac..c62f337 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
index a495e98..c4a7de2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
@@ -37,11 +37,11 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name, data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/create.sql
index 6f7a059..fafd5eb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEMPROPAGATION_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEMPROPAGATION_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/drop.sql
index e443c3e..419ca60 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEMPROPAGATION_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEMPROPAGATION_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.properties
index b7683df..c143f2c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eemsfsbpassivation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.xml
index 27ba715..eaf3b64 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java
index 058b203..60de009 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java
@@ -27,4 +27,4 @@
Map<String, Boolean> doTests(String prefix);
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/create.sql
index 7985340..0bb6bbd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/drop.sql
index 6d8c67f..36675ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.properties
index fc69868..c34e73a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-extendedem"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.xml
index 49d0a85..f0e89ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,10 +58,10 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
@@ -69,9 +69,9 @@
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -79,9 +79,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar, lib/${appname}-par3.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -89,10 +89,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java
index a3952b8..691fc4a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java
@@ -84,14 +84,14 @@
stat.addStatus("local statusNonTxFindPerson", (statusNonTxFindPerson) ? stat.PASS : stat.FAIL);
stat.addStatus("local statusNonTxFindPerson2", (statusNonTxFindPerson2) ? stat.PASS : stat.FAIL);
stat.addStatus("local statusRemovePerson", (statusRemovePerson) ? stat.PASS : stat.FAIL);
- stat.addStatus("local statusRefreshPerson", (statusRefreshPerson) ? stat.FAIL : stat.PASS);
+ stat.addStatus("local statusRefreshPerson", (statusRefreshPerson) ? stat.FAIL : stat.PASS);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/create.sql
index 6ca8284..827525f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EXTENDEDEM_PERSON (
-NAME VARCHAR(256) NOT NULL PRIMARY KEY
-)
-;
+CREATE TABLE EJB30_PERSISTENCE_EXTENDEDEM_PERSON (
+NAME VARCHAR(256) NOT NULL PRIMARY KEY
+)
+;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/drop.sql
index 14b7e4d..cd7d050 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EXTENDEDEM_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EXTENDEDEM_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.properties
index 5d78233..299559b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-tx_propagation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.client.Client"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.xml
index b97627b..df6dd8a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,7 +51,7 @@
<param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
<param name="jdbc.resource.name" value="jdbc/xa"/>
</antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-xa-pool.property.connectionAttributes=;create=true"/>
@@ -81,17 +81,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -99,9 +99,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -110,10 +110,10 @@
<antcall target="runclient-common"/>
<antcall target="runclient-standalone"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java
index 5c0b234..dc21185 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java
@@ -64,7 +64,7 @@
PreparedStatement s = null;
try {
System.err.println("I am in client");
-
+
UserTransaction utx = (UserTransaction)(new javax.naming.InitialContext()).lookup("java:comp/UserTransaction");
ds = (DataSource)(new javax.naming.InitialContext()).lookup("jdbc/xa");
@@ -78,7 +78,7 @@
utx.begin();
System.err.println("utx.begin called ");
-
+
connection = ds.getConnection();
s = connection.prepareStatement("insert into EJB30_PERSISTENCE_EEM_INJECTION_PERSON values('1', '1')");
s.execute();
@@ -94,7 +94,7 @@
utx.rollback();
System.err.println("utx.rollback called ");
}
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -125,7 +125,7 @@
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Person.java
index 14358ff..952cbec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Person.java
@@ -45,7 +45,7 @@
this.data = data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
index 3d4f30b..4b24df7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
@@ -34,25 +34,25 @@
import jakarta.ejb.EJBException;
@Stateful
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.SfulDelegate.class)
public class SfulBean
implements Sful {
private String name;
-
+
private @EJB SfulDelegate delegate;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-tx_propagation-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
public void setName(String name) {
this.name = name;
try {
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
delegate.create(delegateName, delegateData);
@@ -71,8 +71,8 @@
extendedEM.persist(person);
Person foundPerson = delegate.find(name);
-
-
+
+
Map<String, Boolean> map = new HashMap<String, Boolean>();
map.put("findDelegateCreatedPerson", (dPerson != null));
map.put("delegateFoundMe", (foundPerson != null));
@@ -100,5 +100,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
index 62d2097..337a43f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
index 8a96e20..f7a7aad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
@@ -37,12 +37,12 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name);
p.setData(data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/create.sql
index fa60742..c0ab43f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/drop.sql
index 5eb136f..d012c69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/build.xml
index 195c2ef..f559dcc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-asynchronous tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-asynchronous tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.properties
index 773d699..f5f2fc9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-asynchronous-localandremote"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.xml
index 05fd518..011ba54 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -73,7 +73,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java
index 1a7fd82..0413b06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -39,42 +39,42 @@
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- num = Integer.valueOf(args[1]);
+ num = Integer.valueOf(args[1]);
}
public void doTest() {
- try {
+ try {
-
- remoteAsync = (RemoteAsync) new InitialContext().lookup("java:global/" + appName + "/SingletonBean!com.acme.RemoteAsync");
- Future<String> future = remoteAsync.hello("Bob");
-
- boolean isDone = future.isDone();
- System.out.println("isDone = " + isDone);
- String result = future.get();
+ remoteAsync = (RemoteAsync) new InitialContext().lookup("java:global/" + appName + "/SingletonBean!com.acme.RemoteAsync");
+ Future<String> future = remoteAsync.hello("Bob");
- if( !future.isDone() ) {
- throw new RuntimeException("isDone should have been true");
- }
-
- System.out.println("Remote bean says " + result);
-
- stat.addStatus("local main", stat.PASS);
+ boolean isDone = future.isDone();
+ System.out.println("isDone = " + isDone);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ String result = future.get();
+
+ if( !future.isDone() ) {
+ throw new RuntimeException("isDone should have been true");
+ }
+
+ System.out.println("Remote bean says " + result);
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java
index 693a122..ef609d3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java
@@ -32,14 +32,14 @@
@PostConstruct
public void init() {
System.out.println("In SingletonBean::init()");
- Future<String> future = meLocal.hello("init");
+ Future<String> future = meLocal.hello("init");
}
@Asynchronous
public Future<String> hello(String name) {
- System.out.println("In SingletonBean::hello( " + name + ")");
- return new AsyncResult<String>("Hello, " + name);
+ System.out.println("In SingletonBean::hello( " + name + ")");
+ return new AsyncResult<String>("Hello, " + name);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java
index a8e8cb0..797ab1c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java
@@ -19,6 +19,6 @@
import java.util.concurrent.*;
import jakarta.ejb.*;
-public interface SuperAsync {
+public interface SuperAsync {
public Future<String> hello(String name);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.properties
index 9780180..7c1554f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-asynchronous-remote"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.xml
index 75e5fd3..e9eefca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -73,7 +73,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java
index 97ecdc3..9f151b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java
@@ -31,7 +31,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -46,241 +46,241 @@
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- num = Integer.valueOf(args[1]);
+ num = Integer.valueOf(args[1]);
}
public void doTest() {
- try {
+ try {
- statefulBean = (RemoteAsync2) new InitialContext().lookup("java:global/" + appName + "/StatefulBean!com.acme.RemoteAsync2");
- statefulBeanLegacyRemote = (RemoteAsync3) new InitialContext().lookup("java:global/" + appName + "/StatefulBean!com.acme.RemoteAsync3");
- statefulBeanLegacyRemote2 = (RemoteAsync3) new InitialContext().lookup("java:global/" + appName + "/StatefulBean!com.acme.RemoteAsync3");
+ statefulBean = (RemoteAsync2) new InitialContext().lookup("java:global/" + appName + "/StatefulBean!com.acme.RemoteAsync2");
+ statefulBeanLegacyRemote = (RemoteAsync3) new InitialContext().lookup("java:global/" + appName + "/StatefulBean!com.acme.RemoteAsync3");
+ statefulBeanLegacyRemote2 = (RemoteAsync3) new InitialContext().lookup("java:global/" + appName + "/StatefulBean!com.acme.RemoteAsync3");
- Future<String> futureSful = statefulBean.helloAsync();
- System.out.println("Stateful bean says " + futureSful.get());
+ Future<String> futureSful = statefulBean.helloAsync();
+ System.out.println("Stateful bean says " + futureSful.get());
- futureSful = statefulBean.removeAfterCalling();
- System.out.println("Stateful bean removed status = " + futureSful.get());
+ futureSful = statefulBean.removeAfterCalling();
+ System.out.println("Stateful bean removed status = " + futureSful.get());
- boolean gotSfulException = false;
- try {
- futureSful = statefulBean.helloAsync();
- } catch(NoSuchEJBException nsee) {
- System.out.println("Got nsee from helloAsync");
- gotSfulException = true;
- }
+ boolean gotSfulException = false;
+ try {
+ futureSful = statefulBean.helloAsync();
+ } catch(NoSuchEJBException nsee) {
+ System.out.println("Got nsee from helloAsync");
+ gotSfulException = true;
+ }
- try {
- if( !gotSfulException ) {
- System.out.println("return value = " + futureSful.get());
- throw new EJBException("Should have gotten exception");
- }
- } catch(ExecutionException ee) {
- if( ee.getCause() instanceof NoSuchEJBException ) {
- System.out.println("Successfully caught NoSuchEJBException when " +
- "accessing sful bean asynchronously after removal");
- } else {
- throw new EJBException("wrong exception during sfsb access after removal",
- ee);
- }
- }
-
- try {
- Future<String> f = statefulBeanLegacyRemote.throwException("jakarta.ejb.CreateException");
- String result = f.get();
- throw new EJBException("Didn't get CreateException");
- } catch(ExecutionException ee) {
- if( ee.getCause() instanceof CreateException ) {
- System.out.println("Successfully received CreateException");
- } else {
- throw new EJBException("wrong exception received",
- ee);
- }
- }
+ try {
+ if( !gotSfulException ) {
+ System.out.println("return value = " + futureSful.get());
+ throw new EJBException("Should have gotten exception");
+ }
+ } catch(ExecutionException ee) {
+ if( ee.getCause() instanceof NoSuchEJBException ) {
+ System.out.println("Successfully caught NoSuchEJBException when " +
+ "accessing sful bean asynchronously after removal");
+ } else {
+ throw new EJBException("wrong exception during sfsb access after removal",
+ ee);
+ }
+ }
- try {
- Future<String> f = statefulBeanLegacyRemote.throwException("jakarta.ejb.EJBException");
- String result = f.get();
- throw new EJBException("Didn't get EJBException");
- } catch(ExecutionException ee) {
- if( ee.getCause() instanceof RemoteException ) {
- System.out.println("Successfully received RemoteException");
- } else {
- throw new EJBException("wrong exception received",
- ee);
- }
- }
+ try {
+ Future<String> f = statefulBeanLegacyRemote.throwException("jakarta.ejb.CreateException");
+ String result = f.get();
+ throw new EJBException("Didn't get CreateException");
+ } catch(ExecutionException ee) {
+ if( ee.getCause() instanceof CreateException ) {
+ System.out.println("Successfully received CreateException");
+ } else {
+ throw new EJBException("wrong exception received",
+ ee);
+ }
+ }
-
- try {
- Future<String> f = statefulBeanLegacyRemote2.removeAfterCalling();
- String result = f.get();
- System.out.println("result of removeAfterCalling = " + result);
- } catch(ExecutionException ee) {
- throw new EJBException("got unexpected exception", ee);
- }
+ try {
+ Future<String> f = statefulBeanLegacyRemote.throwException("jakarta.ejb.EJBException");
+ String result = f.get();
+ throw new EJBException("Didn't get EJBException");
+ } catch(ExecutionException ee) {
+ if( ee.getCause() instanceof RemoteException ) {
+ System.out.println("Successfully received RemoteException");
+ } else {
+ throw new EJBException("wrong exception received",
+ ee);
+ }
+ }
- try {
- Future<String> f = statefulBeanLegacyRemote2.helloAsync();
- String result = f.get();
- throw new EJBException("Didn't get RemoteException");
- } catch(ExecutionException ee) {
- if( ee.getCause() instanceof NoSuchObjectException ) {
- System.out.println("Successfully received RemoteException");
- } else {
- throw new EJBException("wrong exception received",
- ee);
- }
- } catch(NoSuchObjectException nsoe) {
- System.out.println("Successfully received NoSuchObjectException");
- }
-
- remoteAsync = (RemoteAsync) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
- remoteAsync.startTest();
- ExecutorService executor = Executors.newCachedThreadPool();
+ try {
+ Future<String> f = statefulBeanLegacyRemote2.removeAfterCalling();
+ String result = f.get();
+ System.out.println("result of removeAfterCalling = " + result);
+ } catch(ExecutionException ee) {
+ throw new EJBException("got unexpected exception", ee);
+ }
- int numFireAndForgets = num;
- for(int i = 0; i < numFireAndForgets; i++) {
- executor.execute( new FireAndForget() );
- }
+ try {
+ Future<String> f = statefulBeanLegacyRemote2.helloAsync();
+ String result = f.get();
+ throw new EJBException("Didn't get RemoteException");
+ } catch(ExecutionException ee) {
+ if( ee.getCause() instanceof NoSuchObjectException ) {
+ System.out.println("Successfully received RemoteException");
+ } else {
+ throw new EJBException("wrong exception received",
+ ee);
+ }
+ } catch(NoSuchObjectException nsoe) {
+ System.out.println("Successfully received NoSuchObjectException");
+ }
- CancelAfterAlreadyDone cad = new CancelAfterAlreadyDone();
- executor.execute( cad );
+ remoteAsync = (RemoteAsync) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+ remoteAsync.startTest();
- ProcessAsync pAsyncs[] = new ProcessAsync[num];
- for(int i = 0; i < pAsyncs.length; i++) {
+ ExecutorService executor = Executors.newCachedThreadPool();
- if( ( i % 2 ) == 0 ) {
- pAsyncs[i] = new ProcessAsync(i, 1, 3, false);
- } else {
- pAsyncs[i] = new ProcessAsync(i, 1, 3, true);
- }
+ int numFireAndForgets = num;
+ for(int i = 0; i < numFireAndForgets; i++) {
+ executor.execute( new FireAndForget() );
+ }
- executor.execute( pAsyncs[i] );
- }
+ CancelAfterAlreadyDone cad = new CancelAfterAlreadyDone();
+ executor.execute( cad );
- executor.shutdown();
+ ProcessAsync pAsyncs[] = new ProcessAsync[num];
+ for(int i = 0; i < pAsyncs.length; i++) {
- executor.awaitTermination(15, TimeUnit.SECONDS);
+ if( ( i % 2 ) == 0 ) {
+ pAsyncs[i] = new ProcessAsync(i, 1, 3, false);
+ } else {
+ pAsyncs[i] = new ProcessAsync(i, 1, 3, true);
+ }
- if( !cad.success ) {
- throw new Exception("Cancel after already done failed");
- }
+ executor.execute( pAsyncs[i] );
+ }
- for(int i = 0; i < pAsyncs.length; i++) {
- ProcessAsync pa = pAsyncs[i];
- if( !pa.success() ) {
- throw new Exception(pa.failureMsg);
- }
- }
+ executor.shutdown();
- int ffCount = remoteAsync.getFireAndForgetCount();
- System.out.println("FireAndForget count = " + ffCount + " expected = " +
- numFireAndForgets);
- if( ffCount != numFireAndForgets) {
- throw new Exception("numFireAndForget mismatch");
- }
+ executor.awaitTermination(15, TimeUnit.SECONDS);
- stat.addStatus("local main", stat.PASS);
+ if( !cad.success ) {
+ throw new Exception("Cancel after already done failed");
+ }
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ for(int i = 0; i < pAsyncs.length; i++) {
+ ProcessAsync pa = pAsyncs[i];
+ if( !pa.success() ) {
+ throw new Exception(pa.failureMsg);
+ }
+ }
+
+ int ffCount = remoteAsync.getFireAndForgetCount();
+ System.out.println("FireAndForget count = " + ffCount + " expected = " +
+ numFireAndForgets);
+ if( ffCount != numFireAndForgets) {
+ throw new Exception("numFireAndForget mismatch");
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
class FireAndForget implements Runnable {
- public void run() {
- remoteAsync.fireAndForget();
- }
+ public void run() {
+ remoteAsync.fireAndForget();
+ }
}
class CancelAfterAlreadyDone implements Runnable {
- boolean success = false;
- public void run() {
- try {
- // asyc method that returns immediately.
- // Sleep for a bit so that it's likely already
- // done by the time we call cancel. This should
- // exercise the path that the result piggy-backs
- // on the return of the cancel call.
- Future<String> future = remoteAsync.helloAsync();
- Thread.sleep(2000);
- future.cancel(true);
- String result = future.get();
- System.out.println("cancel after done = " + result);
- success = true;
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
+ boolean success = false;
+ public void run() {
+ try {
+ // asyc method that returns immediately.
+ // Sleep for a bit so that it's likely already
+ // done by the time we call cancel. This should
+ // exercise the path that the result piggy-backs
+ // on the return of the cancel call.
+ Future<String> future = remoteAsync.helloAsync();
+ Thread.sleep(2000);
+ future.cancel(true);
+ String result = future.get();
+ System.out.println("cancel after done = " + result);
+ success = true;
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
}
class ProcessAsync implements Runnable {
- int id;
- int interval;
- int numIntervals;
- boolean cancel;
+ int id;
+ int interval;
+ int numIntervals;
+ boolean cancel;
- boolean cancelled;
- boolean completed;
+ boolean cancelled;
+ boolean completed;
- String failureMsg;
- Throwable exception;
+ String failureMsg;
+ Throwable exception;
- public ProcessAsync(int i, int interval, int numIntervals, boolean cancel) {
- this.id = i;
- this.interval = interval;
- this.numIntervals = numIntervals;
- this.cancel = cancel;
- }
- public void run() {
- try {
- Future<Integer> future =
- remoteAsync.processAsync(interval, numIntervals);
- if( cancel ) {
- future.cancel(true);
- }
+ public ProcessAsync(int i, int interval, int numIntervals, boolean cancel) {
+ this.id = i;
+ this.interval = interval;
+ this.numIntervals = numIntervals;
+ this.cancel = cancel;
+ }
+ public void run() {
+ try {
+ Future<Integer> future =
+ remoteAsync.processAsync(interval, numIntervals);
+ if( cancel ) {
+ future.cancel(true);
+ }
- Integer result = future.get();
+ Integer result = future.get();
- System.out.println("ProcessAsync result : " + result);
- completed = true;
+ System.out.println("ProcessAsync result : " + result);
+ completed = true;
- } catch(ExecutionException ee) {
- exception = ee.getCause();
- if( exception.getClass().getName().equals("java.lang.Exception") ) {
- System.out.println("ProcessAsync succesfully cancelled");
- cancelled = true;
- }
- } catch(Exception e) {
- exception = e;
- }
- }
+ } catch(ExecutionException ee) {
+ exception = ee.getCause();
+ if( exception.getClass().getName().equals("java.lang.Exception") ) {
+ System.out.println("ProcessAsync succesfully cancelled");
+ cancelled = true;
+ }
+ } catch(Exception e) {
+ exception = e;
+ }
+ }
- public boolean success() {
- boolean succeeded = true;
- if (cancel && !cancelled) {
- succeeded = false;
- failureMsg = "pasync " + id + " was not cancelled successfully";
- } else if( !cancel && !completed ) {
- succeeded = false;
- failureMsg = "pasync " + id + " did not complete successfully";
- }
+ public boolean success() {
+ boolean succeeded = true;
+ if (cancel && !cancelled) {
+ succeeded = false;
+ failureMsg = "pasync " + id + " was not cancelled successfully";
+ } else if( !cancel && !completed ) {
+ succeeded = false;
+ failureMsg = "pasync " + id + " did not complete successfully";
+ }
- return succeeded;
- }
+ return succeeded;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java
index 6354612..d21025d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java
@@ -25,14 +25,14 @@
void startTest();
void fireAndForget();
-
+
public int getFireAndForgetCount();
Future<String> helloAsync();
- Future<Integer> processAsync(int sleepInterval, int numIntervals)
- throws Exception;
+ Future<Integer> processAsync(int sleepInterval, int numIntervals)
+ throws Exception;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java
index 3c76283..175ae06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java
@@ -24,9 +24,9 @@
public Future<String> helloAsync() throws java.rmi.RemoteException;
-
+
public Future<String> removeAfterCalling() throws java.rmi.RemoteException;
-
+
public Future<String> throwException(String exception) throws java.rmi.RemoteException, CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java
index b3d86207..5bbb70b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java
@@ -40,58 +40,58 @@
}
public void startTest() {
- System.out.println("in SingletonBean::startTest()");
- // reset state
- fireAndForgetCount = new AtomicInteger();
- return;
+ System.out.println("in SingletonBean::startTest()");
+ // reset state
+ fireAndForgetCount = new AtomicInteger();
+ return;
}
@Asynchronous
public void fireAndForget() {
- System.out.println("In SingletonBean::fireAndForget()");
- fireAndForgetCount.incrementAndGet();
+ System.out.println("In SingletonBean::fireAndForget()");
+ fireAndForgetCount.incrementAndGet();
}
public int getFireAndForgetCount() {
- return fireAndForgetCount.get();
+ return fireAndForgetCount.get();
}
@Asynchronous
public Future<String> helloAsync() {
- return new AsyncResult<String>("hello, world\n");
+ return new AsyncResult<String>("hello, world\n");
}
@Asynchronous
- public Future<Integer> processAsync(int sleepInterval, int numIntervals)
+ public Future<Integer> processAsync(int sleepInterval, int numIntervals)
throws Exception {
- int me = processAsyncCount.incrementAndGet();
- boolean cancelled = false;
- int i = 0;
- while(i < numIntervals) {
- i++;
- if( sessionCtx.wasCancelCalled() ) {
- System.out.println("Cancelling processAsync " + me + " after " +
- i + " intervals");
- cancelled = true;
- break;
- }
- try {
- System.out.println("Sleeping for " + i + "th time in processAsync " +
- me);
- Thread.sleep(sleepInterval * 1000);
- System.out.println("Woke up for " + i + "th time in processAsync " +
- me);
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e);
- }
- }
-
- if( cancelled ) {
- throw new Exception("Cancelled processAsync " + me);
- }
+ int me = processAsyncCount.incrementAndGet();
+ boolean cancelled = false;
+ int i = 0;
+ while(i < numIntervals) {
+ i++;
+ if( sessionCtx.wasCancelCalled() ) {
+ System.out.println("Cancelling processAsync " + me + " after " +
+ i + " intervals");
+ cancelled = true;
+ break;
+ }
+ try {
+ System.out.println("Sleeping for " + i + "th time in processAsync " +
+ me);
+ Thread.sleep(sleepInterval * 1000);
+ System.out.println("Woke up for " + i + "th time in processAsync " +
+ me);
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException(e);
+ }
+ }
- return new AsyncResult<Integer>(numIntervals);
+ if( cancelled ) {
+ throw new Exception("Cancelled processAsync " + me);
+ }
+
+ return new AsyncResult<Integer>(numIntervals);
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java
index 9089131..a4319f7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java
@@ -35,25 +35,25 @@
@Asynchronous
public Future<String> helloAsync() {
- return new AsyncResult<String>("hello, world\n");
+ return new AsyncResult<String>("hello, world\n");
}
@Asynchronous
@Remove
public Future<String> removeAfterCalling() {
- System.out.println("In StatefulBean::removeAfterCalling()");
- return new AsyncResult<String>("removed");
+ System.out.println("In StatefulBean::removeAfterCalling()");
+ return new AsyncResult<String>("removed");
}
@Asynchronous
- public Future<String> throwException(String exception) throws CreateException {
- if( exception.equals("jakarta.ejb.CreateException") ) {
- throw new CreateException();
- } else if ( exception.equals("jakarta.ejb.EJBException") ) {
- throw new EJBException();
- }
+ public Future<String> throwException(String exception) throws CreateException {
+ if( exception.equals("jakarta.ejb.CreateException") ) {
+ throw new CreateException();
+ } else if ( exception.equals("jakarta.ejb.EJBException") ) {
+ throw new EJBException();
+ }
- return new AsyncResult<String>("unsupported exception type");
+ return new AsyncResult<String>("unsupported exception type");
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.properties
index f211e64..0b7c93c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-asynchronous-threadpoolconfig"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
-<property name="numOfInvocations" value="100"/>
-<property name="maxPoolSize" value="32"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
+<property name="numOfInvocations" value="100"/> \u0020
+<property name="maxPoolSize" value="32"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="test.Client"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.xml
index 8d2a23c..92bb8bf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.xml
@@ -29,15 +29,15 @@
&commonBuild;
&testproperties;
- <!-- note that we don't undeploy as part of all target so
+ <!-- note that we don't undeploy as part of all target so
that top-level build script can run remote2 first -->
-
+
<target name="all" depends="build,deploy,run, undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,12 +49,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -62,9 +62,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java
index 0d80aeb..8626ffb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java
@@ -31,7 +31,7 @@
private static String threadNamePrefix = "__ejb-thread-pool";
public static void main(String args[]) throws Exception {
- appName = args[0];
+ appName = args[0];
if(args.length >= 2) {
try {
numOfInvocations = Integer.parseInt(args[1]);
@@ -44,9 +44,9 @@
} catch (NumberFormatException e) { //ignore
}
}
- stat.addDescription(appName);
- Client client = new Client();
- client.doTest();
+ stat.addDescription(appName);
+ Client client = new Client();
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -64,7 +64,7 @@
for(int i = 0; i < numOfInvocations; i++) {
results.add(helloBean.getThreadNameId());
}
-
+
for(Future<String> f : results) {
String s = f.get();
String threadName = s.split(" ")[0];
@@ -76,7 +76,7 @@
}
}
System.out.println("Number of results: " + results.size());
- System.out.println("All " + acceptableThreadNames.size() +
+ System.out.println("All " + acceptableThreadNames.size() +
" acceptable thread names: " + acceptableThreadNames);
stat.addStatus(appName, (failed ? stat.FAIL: stat.PASS));
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java
index 44c5141..0b9743c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java
@@ -31,6 +31,6 @@
} catch (InterruptedException e) {
}
Thread th = Thread.currentThread();
- return new AsyncResult<String>(th.getName() + " " + System.identityHashCode(th));
+ return new AsyncResult<String>(th.getName() + " " + System.identityHashCode(th));
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/build.xml
index 5a1089c..7883b5d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/build.xml
@@ -92,9 +92,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31 tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31 tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/build.xml
index 173b85d..8cc02a1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/build.xml
@@ -70,9 +70,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-ejblite tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-ejblite tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/build.properties
index 867ba0e..78265f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-ejblite-generics"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/>\u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.sun.s1as.devtests.ejb.generics.Client"/>
<property name="contextroot" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/client/Client.java
index 65078df..619effc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/client/Client.java
@@ -28,11 +28,11 @@
* issue 17235 Dependency Injection doesn't work for overloaded methods accepting generic-type parameter
* DO NOT TEST: issue 16372 Not able to make toString() a final method in EJB with no-interface view
* verified in TypeVariableBean
- *
+ *
*/
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -40,43 +40,43 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
- String url = "http://" + host + ":" + port +
+ try {
+ String url = "http://" + host + ":" + port +
"/" + appName + "/TestServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus(appName, stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus(appName, stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus(appName, stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus(appName, stat.FAIL);
+ e.printStackTrace();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java
index 3d61b71..cf7ca63 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java
@@ -51,4 +51,4 @@
abstract public void doSomething5(List<T> t);
abstract public void doSomething6(List<List<T>> t);
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java
index 429a793..02eb937 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java
@@ -43,7 +43,7 @@
testBean.doSomething5(null);
testBean.doSomething6(null);
out.println(testBean.hello());
- out.println("Successfully called methods on " + testBean);
+ out.println("Successfully called methods on " + testBean);
out.println(typeVariableBean.hello("some text"));
out.println(typeVariableBean.hello(10));
@@ -62,4 +62,4 @@
processRequest(request, response);
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.properties
index e2a6aba..0b401b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-ejblite-javamodule"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.xml
index d54439a..5887b41 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
@@ -48,9 +48,9 @@
<antcall target="webclient-war-common">
<param name="hasWebclient" value="false"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,9 +58,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java
index d1df3f6..4ae7129 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java
@@ -29,7 +29,7 @@
@PostConstruct
private void init() {
- System.out.println("In BarManagedBean::init() ");
+ System.out.println("In BarManagedBean::init() ");
}
public void bar() {
@@ -39,12 +39,12 @@
@PreDestroy
private void destroy() {
- System.out.println("In BarManagedBean::destroy() ");
+ System.out.println("In BarManagedBean::destroy() ");
}
public String toString() {
- return "BarManagedBean this = " + super.toString() +
- " s = " + s + " , ds = " + ds;
+ return "BarManagedBean this = " + super.toString() +
+ " s = " + s + " , ds = " + ds;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
index 37bdb80..c64644b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
@@ -36,20 +36,20 @@
@PostConstruct
private void init() {
- System.out.println("In FooManagedBean::init() ");
+ System.out.println("In FooManagedBean::init() ");
}
public void foo() {
- System.out.println("In FooManagedBean::foo() ");
- bmb.bar();
+ System.out.println("In FooManagedBean::foo() ");
+ bmb.bar();
}
public void foobar(String s) {
- System.out.println("foobar::s = " + s);
+ System.out.println("foobar::s = " + s);
}
public Object getThis() {
- return this;
+ return this;
}
public int returnIntNoExceptions() { return 1; }
@@ -68,19 +68,19 @@
@PreDestroy
private void destroy() {
- System.out.println("In FooManagedBean::destroy() ");
+ System.out.println("In FooManagedBean::destroy() ");
}
public String toString() {
- return "FooManagedBean this = " + super.toString() +
+ return "FooManagedBean this = " + super.toString() +
" s = " + s + " , bmb = " + bmb + " , em = " + em;
}
@AroundInvoke
public Object around(InvocationContext c) throws Exception {
- System.out.println("In FooManagedBean::around() ");
- return c.proceed();
+ System.out.println("In FooManagedBean::around() ");
+ return c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java
index 78277d2..8d27af0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java
@@ -73,91 +73,91 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
+ System.out.println("In HelloServlet::init");
- try {
- InitialContext ic = new InitialContext();
- sb2 = (SingletonBean) ic.lookup("java:module/SingletonBean");
- sb3 = (SingletonBean) ic.lookup("java:module/SingletonBean!com.acme.SingletonBean");
+ try {
+ InitialContext ic = new InitialContext();
+ sb2 = (SingletonBean) ic.lookup("java:module/SingletonBean");
+ sb3 = (SingletonBean) ic.lookup("java:module/SingletonBean!com.acme.SingletonBean");
- sb4 = (SingletonBean) ic.lookup("java:module/ES1");
- sb5 = (SingletonBean) ic.lookup("java:module/env/ES2");
+ sb4 = (SingletonBean) ic.lookup("java:module/ES1");
+ sb5 = (SingletonBean) ic.lookup("java:module/env/ES2");
- slsb = (StatelessBean) ic.lookup("java:module/StatelessBean");
- slsb2 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean");
- slsb3 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean!com.acme.StatelessBean");
+ slsb = (StatelessBean) ic.lookup("java:module/StatelessBean");
+ slsb2 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean");
+ slsb3 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean!com.acme.StatelessBean");
- slsb4 = (StatelessBean) ic.lookup("java:app/EL1");
- slsb5 = (StatelessBean) ic.lookup("java:app/env/EL2");
+ slsb4 = (StatelessBean) ic.lookup("java:app/EL1");
+ slsb5 = (StatelessBean) ic.lookup("java:app/env/EL2");
- foo4 = (FooManagedBean)
- ic.lookup("java:module/foomanagedbean");
+ foo4 = (FooManagedBean)
+ ic.lookup("java:module/foomanagedbean");
- foo5 = (FooManagedBean)
- ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/foomanagedbean");
+ foo5 = (FooManagedBean)
+ ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/foomanagedbean");
- foo6 = (FooManagedBean)
- ic.lookup("java:comp/env/foo2ref");
+ foo6 = (FooManagedBean)
+ ic.lookup("java:comp/env/foo2ref");
- System.out.println("My AppName = " +
- ic.lookup("java:app/AppName"));
+ System.out.println("My AppName = " +
+ ic.lookup("java:app/AppName"));
- System.out.println("My ModuleName = " +
- ic.lookup("java:module/ModuleName"));
+ System.out.println("My ModuleName = " +
+ ic.lookup("java:module/ModuleName"));
- } catch(Exception e) {
- e.printStackTrace();
- throw new ServletException(e);
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new ServletException(e);
+ }
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- foo.foobar("foobar");
+ foo.foobar("foobar");
- simpleSingleton.hello();
+ simpleSingleton.hello();
- simpleStateless.hello();
- simpleStateless2.hello();
+ simpleStateless.hello();
+ simpleStateless2.hello();
- sb2.hello();
+ sb2.hello();
- sb3.hello();
+ sb3.hello();
- sb4.hello();
+ sb4.hello();
- sb5.hello();
+ sb5.hello();
- slsb.hello();
+ slsb.hello();
- slsb2.hello();
+ slsb2.hello();
- slsb3.hello();
+ slsb3.hello();
- slsb4.hello();
+ slsb4.hello();
- slsb5.hello();
+ slsb5.hello();
- foo.foo();
- foo.foobar("foobar");
- foo2.foo();
- foo3.foo();
- foo4.foo();
- foo5.foo();
- foo6.foo();
+ foo.foo();
+ foo.foobar("foobar");
+ foo2.foo();
+ foo3.foo();
+ foo4.foo();
+ foo5.foo();
+ foo6.foo();
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
index 6e15166..9703bcc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
@@ -33,24 +33,24 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::init() ");
- c.proceed();
+ System.out.println("In InterceptorA::init() ");
+ c.proceed();
}
@AroundInvoke
public Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::roundInvoke() ");
- if( c.getParameters().length > 0 ) {
- System.out.println("param 1 = " + c.getParameters()[0]);
- }
- return c.proceed();
+ System.out.println("In InterceptorA::roundInvoke() ");
+ if( c.getParameters().length > 0 ) {
+ System.out.println("param 1 = " + c.getParameters()[0]);
+ }
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In Interceptor::destroy() ");
- c.proceed();
+ System.out.println("In Interceptor::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
index c643637..55e03fd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
@@ -28,36 +28,36 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::init() ");
- c.proceed();
+ System.out.println("In InterceptorB::init() ");
+ c.proceed();
}
@Override
- public Object roundInvoke(InvocationContext c) throws Exception {
- throw new RuntimeException("Should not reach here");
+ public Object roundInvoke(InvocationContext c) throws Exception {
+ throw new RuntimeException("Should not reach here");
}
@AroundInvoke
private Object aroundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::aroundInvoke() ");
- c.getContextData().put("foo", "bar");
- Object returnValue = c.proceed();
-
- String foobar = (String) c.getContextData().get("foobar");
- System.out.println("foobar from context data = " + foobar);
- if( foobar == null ) {
- throw new EJBException("invalid context data");
- }
-
- c.getContextData().clear();
-
- return returnValue;
+ System.out.println("In InterceptorB::aroundInvoke() ");
+ c.getContextData().put("foo", "bar");
+ Object returnValue = c.proceed();
+
+ String foobar = (String) c.getContextData().get("foobar");
+ System.out.println("foobar from context data = " + foobar);
+ if( foobar == null ) {
+ throw new EJBException("invalid context data");
+ }
+
+ c.getContextData().clear();
+
+ return returnValue;
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::destroy() ");
- c.proceed();
+ System.out.println("In InterceptorB::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorSuper.java
index 4adbd03..1b9325f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorSuper.java
@@ -24,7 +24,7 @@
@AroundInvoke
protected Object roundInvoke(InvocationContext c) throws Exception {
- throw new RuntimeException("Should not reach here");
+ throw new RuntimeException("Should not reach here");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
index 5b0df58..113b283 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
@@ -30,24 +30,24 @@
@PostConstruct
private void init() {
- System.out.println("In ManagedSuper::init() ");
+ System.out.println("In ManagedSuper::init() ");
}
@PreDestroy
private void destroy() {
- System.out.println("In ManagedSuper::destroy() ");
+ System.out.println("In ManagedSuper::destroy() ");
}
public String toString() {
- return "ManagedSuper this = " + super.toString() +
- " s = " + s + " , ds = " + ds;
+ return "ManagedSuper this = " + super.toString() +
+ " s = " + s + " , ds = " + ds;
}
@AroundInvoke
public Object aroundSuper(InvocationContext c) throws Exception {
- System.out.println("In ManagedSuper::aroundSuper() ");
- return c.proceed();
+ System.out.println("In ManagedSuper::aroundSuper() ");
+ return c.proceed();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java
index 394ffce..9ac5bf2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java
@@ -34,7 +34,7 @@
@Singleton
@LocalBean
public class SingletonBean implements java.util.Observer {
-
+
@EJB private SingletonBean me;
@@ -51,71 +51,71 @@
private StatelessBean slsb3;
private StatelessBean slsb4;
private StatelessBean slsb5;
-
+
public void update(java.util.Observable a,java.lang.Object b) {}
@PostConstruct
private void init() {
- System.out.println("In SingletonBean:init() me = " + me);
-
- if( sessionCtx.getContextData() == null ) {
- throw new EJBException("null context data");
- }
+ System.out.println("In SingletonBean:init() me = " + me);
- try {
- InitialContext ic = new InitialContext();
+ if( sessionCtx.getContextData() == null ) {
+ throw new EJBException("null context data");
+ }
- // Lookup simple form of portable JNDI name
- StatelessBean stateless = (StatelessBean)
- ic.lookup("java:module/StatelessBean");
+ try {
+ InitialContext ic = new InitialContext();
- stateless.hello();
+ // Lookup simple form of portable JNDI name
+ StatelessBean stateless = (StatelessBean)
+ ic.lookup("java:module/StatelessBean");
- // Lookup fully-qualified form of portable JNDI name
- StatelessBean stateless2 = (StatelessBean)
- ic.lookup("java:module/StatelessBean!com.acme.StatelessBean");
+ stateless.hello();
- stateless2.hello();
+ // Lookup fully-qualified form of portable JNDI name
+ StatelessBean stateless2 = (StatelessBean)
+ ic.lookup("java:module/StatelessBean!com.acme.StatelessBean");
- sb2 = (SingletonBean) ic.lookup("java:module/SingletonBean");
- sb3 = (SingletonBean) ic.lookup("java:module/SingletonBean!com.acme.SingletonBean");
+ stateless2.hello();
- sb4 = (SingletonBean) ic.lookup("java:module/ES1");
- sb5 = (SingletonBean) ic.lookup("java:module/env/ES2");
+ sb2 = (SingletonBean) ic.lookup("java:module/SingletonBean");
+ sb3 = (SingletonBean) ic.lookup("java:module/SingletonBean!com.acme.SingletonBean");
- slsb = (StatelessBean) ic.lookup("java:module/StatelessBean");
- slsb2 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean");
- slsb3 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean!com.acme.StatelessBean");
+ sb4 = (SingletonBean) ic.lookup("java:module/ES1");
+ sb5 = (SingletonBean) ic.lookup("java:module/env/ES2");
- slsb4 = (StatelessBean) ic.lookup("java:app/EL1");
- slsb5 = (StatelessBean) ic.lookup("java:app/env/EL2");
+ slsb = (StatelessBean) ic.lookup("java:module/StatelessBean");
+ slsb2 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean");
+ slsb3 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean!com.acme.StatelessBean");
- System.out.println("My AppName = " +
- ic.lookup("java:app/AppName"));
+ slsb4 = (StatelessBean) ic.lookup("java:app/EL1");
+ slsb5 = (StatelessBean) ic.lookup("java:app/env/EL2");
- System.out.println("My ModuleName = " +
- ic.lookup("java:module/ModuleName"));
+ System.out.println("My AppName = " +
+ ic.lookup("java:app/AppName"));
- } catch(NamingException ne) {
- throw new EJBException(ne);
- }
+ System.out.println("My ModuleName = " +
+ ic.lookup("java:module/ModuleName"));
+
+ } catch(NamingException ne) {
+ throw new EJBException(ne);
+ }
}
public void hello() {
- System.out.println("In SingletonBean:hello()");
- if( sessionCtx.getContextData() == null ) {
- throw new EJBException("null context data");
- }
+ System.out.println("In SingletonBean:hello()");
+ if( sessionCtx.getContextData() == null ) {
+ throw new EJBException("null context data");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In SingletonBean:destroy()");
- if( sessionCtx.getContextData() == null ) {
- throw new EJBException("null context data");
- }
+ System.out.println("In SingletonBean:destroy()");
+ if( sessionCtx.getContextData() == null ) {
+ throw new EJBException("null context data");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
index 9dcf979..f91e919 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
@@ -29,21 +29,21 @@
@PostConstruct
private void init() {
- System.out.println("In StatefulBean:init()");
+ System.out.println("In StatefulBean:init()");
}
@PrePassivate
private void prePass() {
- System.out.println("In StatefulBean:prePassivate()");
+ System.out.println("In StatefulBean:prePassivate()");
}
public void hello() {
- System.out.println("In StatefulBean::hello()");
+ System.out.println("In StatefulBean::hello()");
}
@PreDestroy
private void destroy() {
- System.out.println("In StatefulBean:destroy()");
+ System.out.println("In StatefulBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
index f6148a5..e59a38a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
@@ -29,8 +29,8 @@
@Stateless
@Interceptors(InterceptorB.class)
public class StatelessBean {
-
- @Resource
+
+ @Resource
private SessionContext sessionCtx;
@Resource(mappedName="java:module/foomanagedbean")
@@ -44,64 +44,64 @@
@PostConstruct
private void init() {
- System.out.println("In StatelessBean:init()");
+ System.out.println("In StatelessBean:init()");
}
public void hello() {
- System.out.println("In StatelessBean::hello()");
+ System.out.println("In StatelessBean::hello()");
- Map<String, Object> ctxData = sessionCtx.getContextData();
- String fooctx = (String) ctxData.get("foo");
- System.out.println("foo from context data = " + fooctx);
- if( fooctx == null ) {
- throw new EJBException("invalid context data");
- }
- ctxData.put("foobar", "foobar");
+ Map<String, Object> ctxData = sessionCtx.getContextData();
+ String fooctx = (String) ctxData.get("foo");
+ System.out.println("foo from context data = " + fooctx);
+ if( fooctx == null ) {
+ throw new EJBException("invalid context data");
+ }
+ ctxData.put("foobar", "foobar");
- FooManagedBean fmb = (FooManagedBean)
- sessionCtx.lookup("java:module/foomanagedbean");
+ FooManagedBean fmb = (FooManagedBean)
+ sessionCtx.lookup("java:module/foomanagedbean");
- // Make sure dependencies declared in java:comp are visible
- // via equivalent java:module entries since this is a
- // .war
- SessionContext sessionCtx2 = (SessionContext)
- sessionCtx.lookup("java:module/env/com.acme.StatelessBean/sessionCtx");
+ // Make sure dependencies declared in java:comp are visible
+ // via equivalent java:module entries since this is a
+ // .war
+ SessionContext sessionCtx2 = (SessionContext)
+ sessionCtx.lookup("java:module/env/com.acme.StatelessBean/sessionCtx");
- SingletonBean singleton2 = (SingletonBean)
- sessionCtx2.lookup("java:module/env/stateless/singletonref");
+ SingletonBean singleton2 = (SingletonBean)
+ sessionCtx2.lookup("java:module/env/stateless/singletonref");
- // Lookup a comp env dependency declared by another ejb in the .war
- SingletonBean singleton3 = (SingletonBean)
- sessionCtx2.lookup("java:comp/env/com.acme.SingletonBean/me");
+ // Lookup a comp env dependency declared by another ejb in the .war
+ SingletonBean singleton3 = (SingletonBean)
+ sessionCtx2.lookup("java:comp/env/com.acme.SingletonBean/me");
- // Lookup a comp env dependency declared by a servlet
- FooManagedBean fmbServlet = (FooManagedBean)
- sessionCtx.lookup("java:comp/env/foo2ref");
- FooManagedBean fmbServlet2 = (FooManagedBean)
- sessionCtx.lookup("java:module/env/foo2ref");
+ // Lookup a comp env dependency declared by a servlet
+ FooManagedBean fmbServlet = (FooManagedBean)
+ sessionCtx.lookup("java:comp/env/foo2ref");
+ FooManagedBean fmbServlet2 = (FooManagedBean)
+ sessionCtx.lookup("java:module/env/foo2ref");
- // Ensure that each injected or looked up managed bean
- // instance is unique
- Object fooThis = foo.getThis();
- Object foo2This = foo2.getThis();
- Object fmbThis = fmb.getThis();
+ // Ensure that each injected or looked up managed bean
+ // instance is unique
+ Object fooThis = foo.getThis();
+ Object foo2This = foo2.getThis();
+ Object fmbThis = fmb.getThis();
- System.out.println("fooThis = " + fooThis);
- System.out.println("foo2This = " + foo2This);
- System.out.println("fmbThis = " + fmbThis);
- System.out.println("fmbServlet = " + fmbServlet);
- System.out.println("fmbServlet2 = " + fmbServlet2);
+ System.out.println("fooThis = " + fooThis);
+ System.out.println("foo2This = " + foo2This);
+ System.out.println("fmbThis = " + fmbThis);
+ System.out.println("fmbServlet = " + fmbServlet);
+ System.out.println("fmbServlet2 = " + fmbServlet2);
- if( ( fooThis == foo2This ) || ( fooThis == fmbThis ) ||
- ( foo2This == fmbThis ) ) {
- throw new EJBException("Managed bean instances not unique");
- }
+ if( ( fooThis == foo2This ) || ( fooThis == fmbThis ) ||
+ ( foo2This == fmbThis ) ) {
+ throw new EJBException("Managed bean instances not unique");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In StatelessBean:destroy()");
+ System.out.println("In StatelessBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/build.properties
index 211d2c4..52cc5c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-ejblite-jaxrs"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/ContextListener.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/ContextListener.java
index b5f0fa4..230f4d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/ContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/ContextListener.java
@@ -30,53 +30,53 @@
public void contextInitialized(ServletContextEvent sce) {
- System.out.println("In ContextListener::contextInitialized");
+ System.out.println("In ContextListener::contextInitialized");
- try {
+ try {
- FooManagedBean f = (FooManagedBean)
- new InitialContext().lookup("java:module/FooManagedBean");
- f.hello();
+ FooManagedBean f = (FooManagedBean)
+ new InitialContext().lookup("java:module/FooManagedBean");
+ f.hello();
- Object jaxrsEjbGlue = new InitialContext().lookup("java:org.glassfish.ejb.container.interceptor_binding_spi");
- System.out.println("jaxrsEjbGlue = " + jaxrsEjbGlue);
- Method m = jaxrsEjbGlue.getClass().getMethod("registerInterceptor", java.lang.Object.class);
- System.out.println("register interceptor method = " + m);
+ Object jaxrsEjbGlue = new InitialContext().lookup("java:org.glassfish.ejb.container.interceptor_binding_spi");
+ System.out.println("jaxrsEjbGlue = " + jaxrsEjbGlue);
+ Method m = jaxrsEjbGlue.getClass().getMethod("registerInterceptor", java.lang.Object.class);
+ System.out.println("register interceptor method = " + m);
- m.invoke(jaxrsEjbGlue, new com.sun.jersey.JerseyInterceptor());
+ m.invoke(jaxrsEjbGlue, new com.sun.jersey.JerseyInterceptor());
- // Test InjectionManager managed bean functionality
- Object injectionMgr = new InitialContext().lookup("com.sun.enterprise.container.common.spi.util.InjectionManager");
- Method createManagedMethod = injectionMgr.getClass().getMethod("createManagedObject", java.lang.Class.class);
- System.out.println("create managed object method = " + createManagedMethod);
- FooManagedBean f2 = (FooManagedBean) createManagedMethod.invoke(injectionMgr, FooManagedBean.class);
- f2.hello();
- f2.assertInterceptorBinding();
+ // Test InjectionManager managed bean functionality
+ Object injectionMgr = new InitialContext().lookup("com.sun.enterprise.container.common.spi.util.InjectionManager");
+ Method createManagedMethod = injectionMgr.getClass().getMethod("createManagedObject", java.lang.Class.class);
+ System.out.println("create managed object method = " + createManagedMethod);
+ FooManagedBean f2 = (FooManagedBean) createManagedMethod.invoke(injectionMgr, FooManagedBean.class);
+ f2.hello();
+ f2.assertInterceptorBinding();
- Method destroyManagedMethod = injectionMgr.getClass().getMethod("destroyManagedObject", java.lang.Object.class);
- System.out.println("destroy managed object method = " + destroyManagedMethod);
- destroyManagedMethod.invoke(injectionMgr, f2);
+ Method destroyManagedMethod = injectionMgr.getClass().getMethod("destroyManagedObject", java.lang.Object.class);
+ System.out.println("destroy managed object method = " + destroyManagedMethod);
+ destroyManagedMethod.invoke(injectionMgr, f2);
- FooNonManagedBean nonF = (FooNonManagedBean) createManagedMethod.invoke(injectionMgr, FooNonManagedBean.class);
- System.out.println("FooNonManagedBean = " + nonF);
- nonF.hello();
- destroyManagedMethod.invoke(injectionMgr, nonF);
-
- } catch(Exception e) {
- e.printStackTrace();
- }
+ FooNonManagedBean nonF = (FooNonManagedBean) createManagedMethod.invoke(injectionMgr, FooNonManagedBean.class);
+ System.out.println("FooNonManagedBean = " + nonF);
+ nonF.hello();
+ destroyManagedMethod.invoke(injectionMgr, nonF);
+
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
@PostConstruct
public void pc() {
- System.out.println("In ContextListener::postConstruct");
+ System.out.println("In ContextListener::postConstruct");
}
public void contextDestroyed(ServletContextEvent sce) {
- System.out.println("In ContextListener::contextDestroyed");
+ System.out.println("In ContextListener::contextDestroyed");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooManagedBean.java
index b25b5b3..09cffcf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooManagedBean.java
@@ -31,23 +31,23 @@
@PostConstruct
private void init() {
- System.out.println("In FooManagedBean:init()");
+ System.out.println("In FooManagedBean:init()");
}
public void hello() {
- System.out.println("In FooManagedBean::hello()");
+ System.out.println("In FooManagedBean::hello()");
}
public void assertInterceptorBinding() {
- if( !interceptorWasHere ) {
- throw new RuntimeException("interceptor was not here");
- }
+ if( !interceptorWasHere ) {
+ throw new RuntimeException("interceptor was not here");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In FooManagedBean:destroy()");
+ System.out.println("In FooManagedBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooNonManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooNonManagedBean.java
index 09dcb22..3c706cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooNonManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooNonManagedBean.java
@@ -24,25 +24,25 @@
public class FooNonManagedBean {
- @Resource
+ @Resource
private UserTransaction ut;
@PostConstruct
private void init() {
- if( ut == null ) {
- throw new IllegalStateException("ut is null");
- }
+ if( ut == null ) {
+ throw new IllegalStateException("ut is null");
+ }
- System.out.println("In FooNonManagedBean:init()");
+ System.out.println("In FooNonManagedBean:init()");
}
public void hello() {
- System.out.println("In FooNonManagedBean::hello()");
+ System.out.println("In FooNonManagedBean::hello()");
}
@PreDestroy
private void destroy() {
- System.out.println("In FooNonManagedBean:destroy()");
+ System.out.println("In FooNonManagedBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java
index 4fb5328..e12d372 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java
@@ -44,37 +44,37 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
+ System.out.println("In HelloServlet::init");
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- simpleSingleton.hello();
- simpleStateless.hello();
+ simpleSingleton.hello();
+ simpleStateless.hello();
- simpleSingleton.assertInterceptorBinding();
- System.out.println("Singleton interceptor binding asserted");
+ simpleSingleton.assertInterceptorBinding();
+ System.out.println("Singleton interceptor binding asserted");
- simpleStateless.assertInterceptorBinding();
- System.out.println("Stateless interceptor binding asserted");
+ simpleStateless.assertInterceptorBinding();
+ System.out.println("Stateless interceptor binding asserted");
- fooManagedBean.assertInterceptorBinding();
- System.out.println("FooManagedBean interceptor binding asserted");
- fooManagedBean.hello();
+ fooManagedBean.assertInterceptorBinding();
+ System.out.println("FooManagedBean interceptor binding asserted");
+ fooManagedBean.hello();
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/InterceptorA.java
index 7ca7529..59c9783 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/InterceptorA.java
@@ -28,21 +28,21 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::init() ");
- c.proceed();
+ System.out.println("In InterceptorA::init() ");
+ c.proceed();
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::aroundInvoke() ");
- return c.proceed();
+ System.out.println("In InterceptorA::aroundInvoke() ");
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::destroy() ");
- c.proceed();
+ System.out.println("In InterceptorA::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/JerseyInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/JerseyInterceptor.java
index a178650..2ded041 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/JerseyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/JerseyInterceptor.java
@@ -28,24 +28,24 @@
@PostConstruct
private void init(InvocationContext context) throws Exception {
- Object beanInstance = context.getTarget();
+ Object beanInstance = context.getTarget();
- System.out.println("In JerseyInterceptor::init() : " +
- beanInstance);
+ System.out.println("In JerseyInterceptor::init() : " +
+ beanInstance);
- if( beanInstance instanceof SingletonBean ) {
- ((SingletonBean) beanInstance).interceptorWasHere = true;
- } else if( beanInstance instanceof StatelessBean ) {
- ((StatelessBean) beanInstance).interceptorWasHere = true;
- } else if( beanInstance instanceof FooManagedBean ) {
- ((FooManagedBean) beanInstance).interceptorWasHere = true;
- }
+ if( beanInstance instanceof SingletonBean ) {
+ ((SingletonBean) beanInstance).interceptorWasHere = true;
+ } else if( beanInstance instanceof StatelessBean ) {
+ ((StatelessBean) beanInstance).interceptorWasHere = true;
+ } else if( beanInstance instanceof FooManagedBean ) {
+ ((FooManagedBean) beanInstance).interceptorWasHere = true;
+ }
- // ...
+ // ...
- // Invoke next interceptor in chain
- context.proceed();
+ // Invoke next interceptor in chain
+ context.proceed();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java
index d382256..923a55a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java
@@ -39,41 +39,41 @@
@PostConstruct
private void init() {
- System.out.println("In SingletonBean:init() ");
-
- try {
- InitialContext ic = new InitialContext();
+ System.out.println("In SingletonBean:init() ");
- // Lookup simple form of portable JNDI name
- stateless = (StatelessBean)
- ic.lookup("java:module/StatelessBean");
+ try {
+ InitialContext ic = new InitialContext();
- stateless.hello();
+ // Lookup simple form of portable JNDI name
+ stateless = (StatelessBean)
+ ic.lookup("java:module/StatelessBean");
- // Lookup fully-qualified for of portable JNDI name
- stateless2 = (StatelessBean)
- ic.lookup("java:module/StatelessBean!com.acme.StatelessBean");
-
- } catch(NamingException ne) {
- throw new EJBException(ne);
- }
+ stateless.hello();
+
+ // Lookup fully-qualified for of portable JNDI name
+ stateless2 = (StatelessBean)
+ ic.lookup("java:module/StatelessBean!com.acme.StatelessBean");
+
+ } catch(NamingException ne) {
+ throw new EJBException(ne);
+ }
}
public void hello() {
- System.out.println("In SingletonBean:hello()");
- stateless.hello();
- stateless2.hello();
+ System.out.println("In SingletonBean:hello()");
+ stateless.hello();
+ stateless2.hello();
}
public void assertInterceptorBinding() {
- if( !interceptorWasHere ) {
- throw new EJBException("interceptor was not here");
- }
+ if( !interceptorWasHere ) {
+ throw new EJBException("interceptor was not here");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In SingletonBean:destroy()");
+ System.out.println("In SingletonBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
index b10e34c..e764c45 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
@@ -31,23 +31,23 @@
@PostConstruct
private void init() {
- System.out.println("In StatelessBean:init()");
+ System.out.println("In StatelessBean:init()");
}
public void hello() {
- System.out.println("In StatelessBean::hello()");
+ System.out.println("In StatelessBean::hello()");
}
public void assertInterceptorBinding() {
- if( !interceptorWasHere ) {
- throw new EJBException("interceptor was not here");
- }
+ if( !interceptorWasHere ) {
+ throw new EJBException("interceptor was not here");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In StatelessBean:destroy()");
+ System.out.println("In StatelessBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.properties
index 147474e..6b2cc88 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-ejblite-managedbean"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.xml
index b6a3e36..9f325ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.xml
@@ -34,11 +34,11 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
- </antcall>
+ </antcall>
</target>
<target name="build" depends="compile">
@@ -48,9 +48,9 @@
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,9 +58,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/Foo.java
index 383af3d..be3d140 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/Foo.java
@@ -22,7 +22,7 @@
public class Foo {
- @Resource ManagedBean1Int m;
-
+ @Resource ManagedBean1Int m;
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java
index 80e7e8c..eb534b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java
@@ -36,103 +36,103 @@
@WebServlet(urlPatterns="/HelloServlet", loadOnStartup=1)
public class HelloServlet extends HttpServlet {
- @Resource
+ @Resource
private ManagedBeanExtra mbExtra;
@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
- mbExtra.hello();
+ System.out.println("In HelloServlet::init");
+ mbExtra.hello();
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- int numIter = 2;
+ int numIter = 2;
- try {
+ try {
- doTest(numIter, "java:module/ManagedBeanNoInt", 0, "");
- doTest(numIter, "java:module/ManagedBean1Int", numIter, "A");
- doTest(numIter, "java:module/ManagedBean2Int", numIter*2, "AB");
- doTest(numIter, "java:module/ManagedBean2IntPlusBean", numIter*2, "ABM");
- doTest(numIter, "java:module/ManagedBeanNoIntPlusBean", 0, "M");
+ doTest(numIter, "java:module/ManagedBeanNoInt", 0, "");
+ doTest(numIter, "java:module/ManagedBean1Int", numIter, "A");
+ doTest(numIter, "java:module/ManagedBean2Int", numIter*2, "AB");
+ doTest(numIter, "java:module/ManagedBean2IntPlusBean", numIter*2, "ABM");
+ doTest(numIter, "java:module/ManagedBeanNoIntPlusBean", 0, "M");
- doTest(numIter, "java:module/ManagedBean2IntExcludeClass", numIter*2, "");
+ doTest(numIter, "java:module/ManagedBean2IntExcludeClass", numIter*2, "");
- doTest(numIter, "java:module/ManagedBean1Class1MethodLevelInt", numIter*1, "BA");
+ doTest(numIter, "java:module/ManagedBean1Class1MethodLevelInt", numIter*1, "BA");
- doTest(numIter, "java:module/ManagedBean1MethodLevelIntExcludeClass",
- numIter*1, "A");
+ doTest(numIter, "java:module/ManagedBean1MethodLevelIntExcludeClass",
+ numIter*1, "A");
- doTest(numIter, "java:module/ManagedBean2MethodLevelInt", 0, "AB");
-
-
- } catch(Exception e) {
- throw new RuntimeException(e);
- }
-
+ doTest(numIter, "java:module/ManagedBean2MethodLevelInt", 0, "AB");
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ } catch(Exception e) {
+ throw new RuntimeException(e);
+ }
+
+
+
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
private void doTest(int numIter, String lookup, int numInterceptors,
- String aroundInvoke) throws Exception {
+ String aroundInvoke) throws Exception {
- System.out.println("Test " + lookup + " Expect numInstances = " + numIter +
- " , numInterceptors = " + numInterceptors +
- " , aroundInvoke = " + aroundInvoke);
- for(int i = 0; i < numIter; i++) {
- ManagedBeanSuper mb = (ManagedBeanSuper) new InitialContext().lookup(lookup);
+ System.out.println("Test " + lookup + " Expect numInstances = " + numIter +
+ " , numInterceptors = " + numInterceptors +
+ " , aroundInvoke = " + aroundInvoke);
+ for(int i = 0; i < numIter; i++) {
+ ManagedBeanSuper mb = (ManagedBeanSuper) new InitialContext().lookup(lookup);
- try {
- mb.throwAppException();
- throw new RuntimeException("Expected AppException , got nothing");
- } catch(AppException ae) {
- System.out.println("Successfully caught AppException");
- } catch(Throwable t) {
- throw new RuntimeException("Expected AppException , got " + t, t);
- }
+ try {
+ mb.throwAppException();
+ throw new RuntimeException("Expected AppException , got nothing");
+ } catch(AppException ae) {
+ System.out.println("Successfully caught AppException");
+ } catch(Throwable t) {
+ throw new RuntimeException("Expected AppException , got " + t, t);
+ }
- try {
- mb.throwIllegalArgumentException();
- throw new RuntimeException("Expected IllegalArgumentException , got nothing");
- } catch(IllegalArgumentException iae) {
- System.out.println("Successfully caught IllegalArgumentException");
- } catch(Throwable t) {
- throw new RuntimeException("Expected IllegalArgumentException , got " + t, t);
- }
+ try {
+ mb.throwIllegalArgumentException();
+ throw new RuntimeException("Expected IllegalArgumentException , got nothing");
+ } catch(IllegalArgumentException iae) {
+ System.out.println("Successfully caught IllegalArgumentException");
+ } catch(Throwable t) {
+ throw new RuntimeException("Expected IllegalArgumentException , got " + t, t);
+ }
- if( i == (numIter - 1) ) {
- int actualNumInst = mb.getNumInstances();
- int actualNumInter = mb.getNumInterceptorInstances();
- String actualAround = mb.getAroundInvokeSequence();
- System.out.println("actual num Instances = " + actualNumInst);
- System.out.println("actual num Interceptors = " + actualNumInter);
- System.out.println("actual around invoke sequence = " + actualAround);
+ if( i == (numIter - 1) ) {
+ int actualNumInst = mb.getNumInstances();
+ int actualNumInter = mb.getNumInterceptorInstances();
+ String actualAround = mb.getAroundInvokeSequence();
+ System.out.println("actual num Instances = " + actualNumInst);
+ System.out.println("actual num Interceptors = " + actualNumInter);
+ System.out.println("actual around invoke sequence = " + actualAround);
- if( ( actualNumInst != numIter ) || (actualNumInter != numInterceptors) ||
- !actualAround.equals(aroundInvoke) ) {
- throw new RuntimeException("actual results failure for " + lookup);
- }
- }
+ if( ( actualNumInst != numIter ) || (actualNumInter != numInterceptors) ||
+ !actualAround.equals(aroundInvoke) ) {
+ throw new RuntimeException("actual results failure for " + lookup);
+ }
+ }
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
index 010f5ab..bbfa5fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
@@ -33,27 +33,27 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::init() ");
- ((ManagedBeanSuper)c.getTarget()).newInterceptorInstance();
- c.proceed();
+ System.out.println("In InterceptorA::init() ");
+ ((ManagedBeanSuper)c.getTarget()).newInterceptorInstance();
+ c.proceed();
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::aroundInvoke() ");
- if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
- String result = (String) c.proceed();
- return "A" + result;
- } else {
- return c.proceed();
- }
+ System.out.println("In InterceptorA::aroundInvoke() ");
+ if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
+ String result = (String) c.proceed();
+ return "A" + result;
+ } else {
+ return c.proceed();
+ }
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::destroy() ");
- c.proceed();
+ System.out.println("In InterceptorA::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
index cceb79f..f6dbfa4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
@@ -33,27 +33,27 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::init() ");
- ((ManagedBeanSuper)c.getTarget()).newInterceptorInstance();
- c.proceed();
+ System.out.println("In InterceptorB::init() ");
+ ((ManagedBeanSuper)c.getTarget()).newInterceptorInstance();
+ c.proceed();
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::aroundInvoke() ");
- if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
- String result = (String) c.proceed();
- return "B" + result;
- } else {
- return c.proceed();
- }
+ System.out.println("In InterceptorB::aroundInvoke() ");
+ if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
+ String result = (String) c.proceed();
+ return "B" + result;
+ } else {
+ return c.proceed();
+ }
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::destroy() ");
- c.proceed();
+ System.out.println("In InterceptorB::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorSuper.java
index 7280cf6..24cc491 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorSuper.java
@@ -26,20 +26,20 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorSuper::init() ");
- c.proceed();
+ System.out.println("In InterceptorSuper::init() ");
+ c.proceed();
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorSuper::aroundInvoke() ");
- return c.proceed();
+ System.out.println("In InterceptorSuper::aroundInvoke() ");
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In InterceptorSuper::destroy() ");
- c.proceed();
+ System.out.println("In InterceptorSuper::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Class1MethodLevelInt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Class1MethodLevelInt.java
index eaa810f..6c49077 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Class1MethodLevelInt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Class1MethodLevelInt.java
@@ -31,26 +31,26 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
@Interceptors({InterceptorA.class})
public String getAroundInvokeSequence() {
- return "";
+ return "";
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Int.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Int.java
index 36ed250..8f03640 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Int.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Int.java
@@ -29,20 +29,20 @@
static private int numInterceptorInstances = 0;
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
-
+
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1MethodLevelIntExcludeClass.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1MethodLevelIntExcludeClass.java
index eecadc0..93b828c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1MethodLevelIntExcludeClass.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1MethodLevelIntExcludeClass.java
@@ -32,27 +32,27 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
@Interceptors({InterceptorA.class})
@ExcludeClassInterceptors
public String getAroundInvokeSequence() {
- return "";
+ return "";
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2Int.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2Int.java
index 58a0b6b..d6762ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2Int.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2Int.java
@@ -31,22 +31,22 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
-
+
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntExcludeClass.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntExcludeClass.java
index 4f8646c..461d365 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntExcludeClass.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntExcludeClass.java
@@ -20,7 +20,7 @@
import jakarta.interceptor.Interceptors;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.InvocationContext;
-import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
@ManagedBean("ManagedBean2IntExcludeClass")
@Interceptors({InterceptorA.class, InterceptorB.class})
@@ -32,25 +32,25 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
@ExcludeClassInterceptors
public String getAroundInvokeSequence() {
- return "";
+ return "";
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntPlusBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntPlusBean.java
index 0fee3de..daa135b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntPlusBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntPlusBean.java
@@ -31,31 +31,31 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In ManagedBean2IntPlusBean::roundInvoke() ");
- if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
- String result = (String) c.proceed();
- return "M" + result;
- } else {
- return c.proceed();
- }
+ System.out.println("In ManagedBean2IntPlusBean::roundInvoke() ");
+ if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
+ String result = (String) c.proceed();
+ return "M" + result;
+ } else {
+ return c.proceed();
+ }
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2MethodLevelInt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2MethodLevelInt.java
index acb323a..05dd55c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2MethodLevelInt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2MethodLevelInt.java
@@ -30,26 +30,26 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
@Interceptors({InterceptorA.class, InterceptorB.class})
public String getAroundInvokeSequence() {
- return "";
+ return "";
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoInt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoInt.java
index 5313a8d..333b7bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoInt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoInt.java
@@ -25,12 +25,12 @@
static private int numInstances = 0;
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoIntPlusBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoIntPlusBean.java
index d00d87a..c23f1fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoIntPlusBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoIntPlusBean.java
@@ -30,31 +30,31 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In ManagedBeanNoIntPlusBean::roundInvoke() ");
- if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
- String result = (String) c.proceed();
- return "M" + result;
- } else {
- return c.proceed();
- }
+ System.out.println("In ManagedBeanNoIntPlusBean::roundInvoke() ");
+ if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
+ String result = (String) c.proceed();
+ return "M" + result;
+ } else {
+ return c.proceed();
+ }
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanSuper.java
index 7359c20..48bcf5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanSuper.java
@@ -27,12 +27,12 @@
public String getAroundInvokeSequence() { return ""; }
public String throwAppException() throws AppException {
- throw new AppException();
+ throw new AppException();
}
public String throwIllegalArgumentException() {
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.properties
index e1ab5cc..b349a6d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-ejblite-sinitcallejb"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.xml
index 208cde2..f9ff039 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
@@ -48,9 +48,9 @@
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,9 +58,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java
index 8b8a434..73e0c2e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java
@@ -33,20 +33,20 @@
public void contextInitialized(ServletContextEvent sce) {
- System.out.println("In ContextListener::contextInitialized");
+ System.out.println("In ContextListener::contextInitialized");
- simpleStateless.hello();
+ simpleStateless.hello();
}
@PostConstruct
public void pc() {
- System.out.println("In ContextListener::postConstruct");
+ System.out.println("In ContextListener::postConstruct");
}
public void contextDestroyed(ServletContextEvent sce) {
- System.out.println("In ContextListener::contextDestroyed");
+ System.out.println("In ContextListener::contextDestroyed");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java
index 7ae875f..0cab3ac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java
@@ -46,59 +46,59 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
- simpleSingleton.hello();
- simpleStateless.hello();
- simpleStateful.hello();
+ System.out.println("In HelloServlet::init");
+ simpleSingleton.hello();
+ simpleStateless.hello();
+ simpleStateful.hello();
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- simpleSingleton.hello();
+ simpleSingleton.hello();
- try {
- simpleStateless.helloPackage();
- throw new RuntimeException("Expected exception when calling package-private method");
- } catch(EJBException e) {
- System.out.println("Successfully got exception when calling package private method on no-interface view");
- }
+ try {
+ simpleStateless.helloPackage();
+ throw new RuntimeException("Expected exception when calling package-private method");
+ } catch(EJBException e) {
+ System.out.println("Successfully got exception when calling package private method on no-interface view");
+ }
- try {
- simpleStateless.helloProtected();
- throw new RuntimeException("Expected exception when calling protected method");
- } catch(EJBException e) {
- System.out.println("Successfully got exception when calling protected method on no-interface view");
- }
+ try {
+ simpleStateless.helloProtected();
+ throw new RuntimeException("Expected exception when calling protected method");
+ } catch(EJBException e) {
+ System.out.println("Successfully got exception when calling protected method on no-interface view");
+ }
- try {
- InitialContext ic = new InitialContext();
- for (NamingEnumeration<Binding> e = ic.listBindings("java:comp/env"); e.hasMore(); ) {
+ try {
+ InitialContext ic = new InitialContext();
+ for (NamingEnumeration<Binding> e = ic.listBindings("java:comp/env"); e.hasMore(); ) {
Binding b = e.next();// java:comp/env/xxx
final String name = b.getName().substring("java:comp/env/".length());
final String cl = b.getClassName();
final Object o = b.getObject();
- System.out.println("binding = " + b + " , name = " + name + " , cl = " + cl + " , object = " + o);
- if( !b.getName().startsWith("java:comp/env") ) {
- throw new RuntimeException("invalid returned env entry prefix");
- }
- }
- // assumes 299 enabled new InitialContext().lookup("java:comp/BeanManager");
- } catch(Exception e) {
- throw new ServletException(e);
- }
+ System.out.println("binding = " + b + " , name = " + name + " , cl = " + cl + " , object = " + o);
+ if( !b.getName().startsWith("java:comp/env") ) {
+ throw new RuntimeException("invalid returned env entry prefix");
+ }
+ }
+ // assumes 299 enabled new InitialContext().lookup("java:comp/BeanManager");
+ } catch(Exception e) {
+ throw new ServletException(e);
+ }
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java
index 0d7328b..8516013 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java
@@ -25,42 +25,42 @@
@Startup
public class SimpleSingleton {
- @Resource
+ @Resource
private SessionContext sessionCtx;
@PostConstruct
private void init() {
- System.out.println("In SimpleSingleton:init()");
+ System.out.println("In SimpleSingleton:init()");
- try {
- SimpleStateless ss = (SimpleStateless)
- sessionCtx.lookup("java:app/env/slref");
- ss.hello();
- System.out.println("Successfully looked up web-component defined environment dependency from @Startup Singleton @PostConstruct");
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ try {
+ SimpleStateless ss = (SimpleStateless)
+ sessionCtx.lookup("java:app/env/slref");
+ ss.hello();
+ System.out.println("Successfully looked up web-component defined environment dependency from @Startup Singleton @PostConstruct");
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
}
public void hello() {
- System.out.println("In SimpleSingleton:hello()");
- try {
- SimpleStateless ss = (SimpleStateless)
- sessionCtx.lookup("java:app/env/slref");
- ss.hello();
+ System.out.println("In SimpleSingleton:hello()");
+ try {
+ SimpleStateless ss = (SimpleStateless)
+ sessionCtx.lookup("java:app/env/slref");
+ ss.hello();
- // assumes 299 enabled new InitialContext().lookup("java:comp/BeanManager");
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ // assumes 299 enabled new InitialContext().lookup("java:comp/BeanManager");
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In SimpleSingleton:destroy()");
+ System.out.println("In SimpleSingleton:destroy()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java
index 9c519b9..ad70bd8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java
@@ -24,18 +24,18 @@
@PostConstruct
private void init() {
- System.out.println("In SimpleStateful:init()");
+ System.out.println("In SimpleStateful:init()");
}
public void hello() {
- System.out.println("In SimpleStateful:hello()");
+ System.out.println("In SimpleStateful:hello()");
}
@PreDestroy
private void destroy() {
- System.out.println("In SimpleStateful:destroy()");
+ System.out.println("In SimpleStateful:destroy()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java
index 066d15b..b2b59a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java
@@ -24,26 +24,26 @@
@PostConstruct
private void init() {
- System.out.println("In SimpleStateless:init()");
+ System.out.println("In SimpleStateless:init()");
}
public void hello() {
- System.out.println("In SimpleStateless:hello()");
+ System.out.println("In SimpleStateless:hello()");
}
protected void helloProtected() {
- System.out.println("In SimpleStateless:helloProtected()");
+ System.out.println("In SimpleStateless:helloProtected()");
}
void helloPackage() {
- System.out.println("In SimpleStateless:helloPackage()");
+ System.out.println("In SimpleStateless:helloPackage()");
}
@PreDestroy
private void destroy() {
- System.out.println("In SimpleStateless:destroy()");
+ System.out.println("In SimpleStateless:destroy()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.properties
index a74c3cb..7604f52 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-basic"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.xml
index c0f5847..1cff99d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,24 +49,24 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java
index fc08df8..7c0e443 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java
@@ -85,7 +85,7 @@
} else {
stat.addStatus("create container with a wrong provider", stat.PASS);
}
- } catch (EJBException e) {
+ } catch (EJBException e) {
System.err.println("==> Caught expected: " + e.getMessage());
stat.addStatus("create container with a wrong provider", stat.PASS);
}
@@ -128,7 +128,7 @@
stat.addStatus("create container without closing the current", stat.FAIL);
System.err.println("==> ERROR: Created another container without closing the current...");
}
- } catch (EJBException e) {
+ } catch (EJBException e) {
System.err.println("==> Caught expected: " + e.getMessage());
stat.addStatus("create container without closing the current", stat.PASS);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/build.xml
index 44f7adf..d1e26bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/build.xml
@@ -91,7 +91,7 @@
<!-- These tests require Full Profile -->
<antcall target="modulewithappname"/>
<antcall target="twomodules"/>
- <antcall target="twomoduleswithlibs"/>
+ <antcall target="twomoduleswithlibs"/>
<antcall target="ejbandwar"/>
<!-- These 2 tests will stop domain to run -->
<antcall target="mdb"/>
@@ -118,7 +118,7 @@
<target name="timertest">
<record name="timertest.output" action="start" />
- <echo>Running timertest target ${timer.test.type} </echo>
+ <echo>Running timertest target ${timer.test.type} </echo>
<ant dir="timertest" target="${timer.test.type}"/>
<record name="timertest.output" action="stop" />
</target>
@@ -190,9 +190,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-embedded tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-embedded tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.properties
index 74c4b04..fbda21f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-datasourcedef"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.xml
index 6263e26..7d3bbbb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,24 +49,24 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.properties
index d4bb31a..42617ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-ejbwandwar"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-web"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-web"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.xml
index 04d8a3f..668a04f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -84,15 +84,15 @@
</delete>
<move file="${build.classes.dir}/tmp" tofile="${assemble.dir}/tmp"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_war"/>
<antcall target="run_dir"/>
</target>
-
+
<target name="run_war" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-other.jar:${assemble.dir}/${appname}-web.war:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -103,7 +103,7 @@
<target name="run_dir" depends="init-common">
<mkdir dir="${assemble.dir}/other"/>
<unzip src="${assemble.dir}/${appname}-other.jar" dest="${assemble.dir}/other"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/tmp:${assemble.dir}/other:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/descriptor/web.xml
index b620395..47d9a15 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/descriptor/web.xml
@@ -19,6 +19,6 @@
<web-app 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_3_0.xsd"
- version="3.0">
+ version="3.0">
<module-name>sample</module-name>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEntity.java
index b2bd250..285d833 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEntity.java
@@ -31,8 +31,8 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -40,15 +40,15 @@
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.properties
index 5aa1365..b5d1a63 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-ejbwinwar"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-web"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-web"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.xml
index 0f35cfd..8883578 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -75,15 +75,15 @@
</delete>
<move file="${build.classes.dir}/tmp" tofile="${assemble.dir}/tmp"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_war"/>
<antcall target="run_dir"/>
</target>
-
+
<target name="run_war" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-web.war:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -93,7 +93,7 @@
<target name="run_war_installed_instance" depends="init-common">
<antcall target="start-database"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-web.war:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -114,7 +114,7 @@
</target>
<target name="run_dir" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/tmp:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/descriptor/web.xml
index b620395..47d9a15 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/descriptor/web.xml
@@ -19,6 +19,6 @@
<web-app 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_3_0.xsd"
- version="3.0">
+ version="3.0">
<module-name>sample</module-name>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEntity.java
index b2bd250..285d833 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEntity.java
@@ -31,8 +31,8 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -40,15 +40,15 @@
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.properties
index 02089ee..226ef0a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-embedasync"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.xml
index 8fa95d8..8c95124 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,10 +46,10 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="descriptor/beans.xml" todir="${build.classes.dir}/META-INF"/>
- <!--
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <copy file="descriptor/beans.xml" todir="${build.classes.dir}/META-INF"/>
+ <!--
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*.class">
</jar>
@@ -57,15 +57,15 @@
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java
index cdb0d29..d0a44d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java
@@ -50,46 +50,46 @@
// ok now let's look up the EJB...
Context ic = c.getContext();
try {
- System.out.println("Sleeping for a second...");
- Thread.sleep(1000);
+ System.out.println("Sleeping for a second...");
+ Thread.sleep(1000);
- SingletonBean sb = (SingletonBean) ic.
- lookup("java:global/classes/SingletonBean!com.acme.SingletonBean");
- sb.hello();
+ SingletonBean sb = (SingletonBean) ic.
+ lookup("java:global/classes/SingletonBean!com.acme.SingletonBean");
+ sb.hello();
- StatefulBean sfTimeout = (StatefulBean) ic.
- lookup("java:global/classes/StatefulBean");
- StatefulBean2 sfNoTimeout = (StatefulBean2) ic.
- lookup("java:global/classes/StatefulBean2");
- sfTimeout.hello();
- sfNoTimeout.hello();
+ StatefulBean sfTimeout = (StatefulBean) ic.
+ lookup("java:global/classes/StatefulBean");
+ StatefulBean2 sfNoTimeout = (StatefulBean2) ic.
+ lookup("java:global/classes/StatefulBean2");
+ sfTimeout.hello();
+ sfNoTimeout.hello();
- System.out.println("Sleeping to wait for sf bean to be removed ...");
- Thread.sleep(7000);
- System.out.println("Waking up , checking sf bean existence");
+ System.out.println("Sleeping to wait for sf bean to be removed ...");
+ Thread.sleep(7000);
+ System.out.println("Waking up , checking sf bean existence");
- try {
- sfTimeout.hello();
- throw new RuntimeException("StatefulTimeout(0) bean should have timed out");
- } catch(EJBException e) {
- System.out.println("Stateful bean successfully timed out");
- }
+ try {
+ sfTimeout.hello();
+ throw new RuntimeException("StatefulTimeout(0) bean should have timed out");
+ } catch(EJBException e) {
+ System.out.println("Stateful bean successfully timed out");
+ }
- sfNoTimeout.hello();
- System.out.println("Stateful bean with longer timeout is still around");
+ sfNoTimeout.hello();
+ System.out.println("Stateful bean with longer timeout is still around");
- /**
- HelloRemote hr = (HelloRemote) ic.
- lookup("java:global/classes/SingletonBean!com.acme.HelloRemote");
- hr.hello();
- */
+ /**
+ HelloRemote hr = (HelloRemote) ic.
+ lookup("java:global/classes/SingletonBean!com.acme.HelloRemote");
+ hr.hello();
+ */
- if( sb.getPassed() ) {
- System.out.println("getPassed() returned true");
- stat.addStatus("embedded async test", stat.PASS);
- } else {
- throw new EJBException("getPassed() returned false");
- }
+ if( sb.getPassed() ) {
+ System.out.println("getPassed() returned true");
+ stat.addStatus("embedded async test", stat.PASS);
+ } else {
+ throw new EJBException("getPassed() returned false");
+ }
} catch (Exception e) {
stat.addStatus("embedded async test", stat.FAIL);
System.out.println("ERROR calling EJB:");
@@ -97,8 +97,8 @@
}
System.out.println("Closing container");
-
- c.close();
+
+ c.close();
System.out.println("Done Closing container");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
index 1ad414f..606e25c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
@@ -39,36 +39,36 @@
@PostConstruct
public void init() {
System.out.println("In SingletonBean::init()");
- System.out.println("Thread = " + Thread.currentThread());
- me.fooAsync();
+ System.out.println("Thread = " + Thread.currentThread());
+ me.fooAsync();
- try {
- BeanManager beanMgr = (BeanManager)
- new InitialContext().lookup("java:comp/BeanManager");
- System.out.println("Successfully retrieved bean manager " +
- beanMgr + " for JCDI enabled app");
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e);
- }
-
+ try {
+ BeanManager beanMgr = (BeanManager)
+ new InitialContext().lookup("java:comp/BeanManager");
+ System.out.println("Successfully retrieved bean manager " +
+ beanMgr + " for JCDI enabled app");
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException(e);
+ }
+
}
-
+
public String hello() {
- System.out.println("In SingletonBean::hello()");
- return "hello, world!\n";
+ System.out.println("In SingletonBean::hello()");
+ return "hello, world!\n";
}
@Asynchronous
public void fooAsync() {
- System.out.println("In SingletonBean::fooAsync()");
- System.out.println("Thread = " + Thread.currentThread());
- gotAsyncCall = true;
+ System.out.println("In SingletonBean::fooAsync()");
+ System.out.println("Thread = " + Thread.currentThread());
+ gotAsyncCall = true;
}
public boolean getPassed() {
- return gotAsyncCall;
+ return gotAsyncCall;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
index 98550db..34568d7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
@@ -26,8 +26,8 @@
public class StatefulBean {
@Inject
- public StatefulBean(SingletonBean sing) {
- System.out.println("In StatefulBean ctor sing = " + sing);
+ public StatefulBean(SingletonBean sing) {
+ System.out.println("In StatefulBean ctor sing = " + sing);
}
@PostConstruct
@@ -36,7 +36,7 @@
}
public void hello() {
- System.out.println("In StatefulBean::hello()");
+ System.out.println("In StatefulBean::hello()");
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java
index ae2767f..c1a2fd9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java
@@ -30,7 +30,7 @@
}
public void hello() {
- System.out.println("In StatefulBean2::hello()");
+ System.out.println("In StatefulBean2::hello()");
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedded.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedded.xml
index 5c5f2aa..48d775f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedded.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedded.xml
@@ -27,7 +27,7 @@
<condition property="uber.jar" value="${uber.jar.repo}/repository/org/glassfish/extras/glassfish-embedded-all/3.1-SNAPSHOT/glassfish-embedded-all-3.1-SNAPSHOT.jar">
<and>
- <isset property="uber.mode"/>
+ <isset property="uber.mode"/>
<not>
<isset property="uber.jar"/>
</not>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.properties
index 1257fe4..01d10c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-jaxrs"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-web"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-web"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.xml
index 94f49cb..832aefd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-util"/>
<antcall target="compile-common">
@@ -75,25 +75,25 @@
</delete>
<move file="${build.classes.dir}/tmp" tofile="${assemble.dir}/tmp"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_ejb"/>
<!-- Doesn't work
<antcall target="run_rest"/>
-->
</target>
-
+
<target name="run_ejb" depends="init-common">
<antcall target="run_war_ejb"/>
<antcall target="run_dir_ejb"/>
</target>
-
+
<target name="run_rest" depends="init-common">
<antcall target="run_war_rest"/>
<antcall target="run_dir_rest"/>
</target>
-
+
<target name="run_war_ejb" depends="init-common">
<antcall target="run_test">
<param name="test-path" value="${assemble.dir}/${appname}-web.war"/>
@@ -101,7 +101,7 @@
<param name="packaging" value="war"/>
</antcall>
</target>
-
+
<target name="run_war_rest" depends="init-common">
<antcall target="run_test">
<param name="test-path" value="${assemble.dir}/${appname}-web.war"/>
@@ -109,7 +109,7 @@
<param name="packaging" value="war"/>
</antcall>
</target>
-
+
<target name="run_dir_ejb" depends="init-common">
<antcall target="run_test">
<param name="test-path" value="${assemble.dir}/tmp"/>
@@ -117,7 +117,7 @@
<param name="packaging" value="dir"/>
</antcall>
</target>
-
+
<target name="run_dir_rest" depends="init-common">
<antcall target="run_test">
<param name="test-path" value="${assemble.dir}/tmp"/>
@@ -125,9 +125,9 @@
<param name="packaging" value="dir"/>
</antcall>
</target>
-
+
<target name="run_test" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${test-path}:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java
index ee5e095..af7391a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java
@@ -128,7 +128,7 @@
e.printStackTrace();
}
}
- }
+ }
stat.addStatus("EJB embedded " + appName + " EJB", (pass)? stat.PASS : stat.FAIL);
System.out.println("..........FINISHED test");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/descriptor/web.xml
index ae8a8a1..162bb0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/descriptor/web.xml
@@ -19,7 +19,7 @@
<web-app 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_3_0.xsd"
- version="3.0">
+ version="3.0">
<module-name>sample</module-name>
<servlet>
<servlet-name>jakarta.ws.rs.core.Application</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEntity.java
index b2bd250..285d833 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEntity.java
@@ -31,8 +31,8 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -40,15 +40,15 @@
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.properties
index 96fc181..e168505 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-manifestonly"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.xml
index 4ce5a82..3a76dc0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,24 +49,24 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-pu.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class,**/*Bean.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-client.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-client.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Client.class">
</jar>
@@ -75,15 +75,15 @@
<attribute name="Class-Path" value="file:${assemble.dir}/${appname}-ejb.jar file:${assemble.dir}/${appname}-client.jar file:${env.APS_HOME}/lib/reporter.jar"/>
</manifest>
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-all.jar:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.properties
index 00490d9..c0d10d9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-mdb"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml
index 9d809ae..b39635e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,14 +51,14 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<echo message="...Starting DAS to create JMS resources...."/>
<antcall target="startDomain"/>
@@ -91,8 +91,8 @@
<antcall target="stopDomain"/>
<echo message="Domain has beed STOPPED to run the test"/>
- </target>
-
+ </target>
+
<target name="unsetup" depends="init-common">
<echo message="...Starting DAS to delete JMS resources...."/>
<antcall target="startDomain"/>
@@ -120,15 +120,15 @@
<!-- Should domain be stopped? -->
<antcall target="stopDomain"/>
<echo message="Domain has beed STOPPED"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.properties
index d81c41a..2464a3a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-modulewithappname"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.xml
index 3d55b97..e448e66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-util"/>
<antcall target="compile-common">
@@ -50,31 +50,31 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class,**/*Bean.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-pu.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.properties
index ed9b49f..4a3488f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-modulewithinheritance"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.xml
index 4afe4c7..d0aa5a1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,36 +49,36 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class,**/*Bean.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-pu.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
<jar jarfile="${assemble.dir}/${appname}-base.jar"
basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleBase.class,**/SimpleInterface.class">
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-pu.jar:${assemble.dir}/${appname}-base.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java
index 30538e3..9d63c21 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java
@@ -76,7 +76,7 @@
stat.addStatus("EJB embedded create container", stat.FAIL);
System.out.println("Created another container without closing the current...");
}
- } catch (EJBException e) {
+ } catch (EJBException e) {
System.out.println("Caught expected: " + e.getMessage());
stat.addStatus("EJB embedded create container", stat.PASS);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.properties
index b7bab8d..426a584 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-modulewithlibs"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.xml
index 8c36647..c12664e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,36 +49,36 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class,**/*Bean.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-pu.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
<jar jarfile="${assemble.dir}/${appname}-base.jar"
basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleBase.class,**/SimpleInterface.class">
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-pu.jar:${assemble.dir}/${appname}-base.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java
index 735fef6..6eaea7e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java
@@ -76,7 +76,7 @@
stat.addStatus("EJB embedded create container", stat.FAIL);
System.out.println("Created another container without closing the current...");
}
- } catch (EJBException e) {
+ } catch (EJBException e) {
System.out.println("Caught expected: " + e.getMessage());
stat.addStatus("EJB embedded create container", stat.PASS);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.properties
index cbc1e46..31a82d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-modulewithmanifest"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.xml
index 2a92688..e3b6a76 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,34 +49,34 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-pu.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class,**/*Bean.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
<manifest>
<attribute name="Class-Path" value="file:${assemble.dir}/${appname}-pu.jar"/>
</manifest>
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.properties
index 064f4b8..6d02309 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-profile"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.xml
index 28b05a7..464b3fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,21 +49,21 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.properties
index 921596d..ccd4809 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-remote"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.xml
index e7e865f..01cedc3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,28 +51,28 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="stopDomain"/>
<echo message="Domain has beed STOPPED to run the test"/>
<antcall target="run_se"/>
- </target>
-
+ </target>
+
<target name="warn" depends="init-common">
<echo message="Domain was STOPPED to run the test"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.properties
index ade3a9b..2527f3a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-skipjar"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.xml
index 029e8ae..ab711be 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,37 +49,37 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class,**/*Bean.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-pu.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
<jar jarfile="${assemble.dir}/${appname}-client.jar"
basedir="${build.classes.dir}"
update="true" includes ="**/*.class"
manifest="./manifest/MANIFEST.MF">
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
<antcall target="run_se_unpacked"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-client.jar:${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -91,7 +91,7 @@
<mkdir dir="${assemble.dir}/${appname}-clientdir"/>
<unzip src="${assemble.dir}/${appname}-client.jar" dest="${assemble.dir}/${appname}-clientdir"/>
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-clientdir:${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.properties
index 4f009f8..d0fdf49 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-testclose"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.xml
index ba0ca42..9b44bef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,24 +49,24 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEntity.java
index 0a41546..67b6f14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEntity.java
@@ -31,8 +31,8 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -40,10 +40,10 @@
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.properties
index bd44490..c92a9b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-timertest"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.xml
index 41def7d..1cacfa6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.xml
@@ -37,7 +37,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,29 +50,29 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se">
<param name="persistent" value="true"/>
</antcall>
</target>
-
+
<target name="run-non-persistent" depends="init-common">
<antcall target="run_se">
<param name="persistent" value="false"/>
</antcall>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.properties
index 32ba964..693a58a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-twoc"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.xml
index afe08a7..5428f3d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,24 +49,24 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -74,7 +74,7 @@
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8085"/>
-->
- <arg line="${jndiroot}"/>
+ <arg line="${jndiroot}"/>
</java>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEntity.java
index b2bd250..285d833 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEntity.java
@@ -31,8 +31,8 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -40,15 +40,15 @@
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.properties
index 0f0e1a1..d63bd78 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-two-modules"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.xml
index 26cac94..429f4b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,30 +49,30 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/Simple*.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SingletonBean.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb1.jar:${assemble.dir}/${appname}-ejb2.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java
index 4e52ed3..3a13d1c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java
@@ -80,7 +80,7 @@
e.printStackTrace();
stat.addStatus("EJB embedded module 1", stat.FAIL);
} finally {
- if (c != null)
+ if (c != null)
c.close();
}
System.out.println("..........FINISHED 2 modules Embedded test");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java
index 280923c..e80f9f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java
@@ -17,8 +17,8 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
-import jakarta.ejb.SessionContext;
+import jakarta.ejb.Startup;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.security.PermitAll;
@@ -28,7 +28,7 @@
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.properties
index 049677e..d33d1b9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-two-modules-with-libs"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.xml
index 3d0d2fd..16e7952 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -54,35 +54,35 @@
<target name="build-jars">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-pu1.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu1.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-base.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-base.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleBase.class,**/SimpleInterface.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SingletonBean.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="create-dirs">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}/${appname}-ejb1/classes"/>
@@ -97,16 +97,16 @@
<mkdir dir="${assemble.dir}/${appname}-ejb2/classes"/>
<unzip src="${assemble.dir}/${appname}-ejb2.jar" dest="${assemble.dir}/${appname}-ejb2/classes"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se_jars"/>
<antcall target="run_se_dirs"/>
</target>
-
+
<target name="run_se_jars" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb1.jar:${assemble.dir}/${appname}-ejb2.jar:${assemble.dir}/${appname}-base.jar:${assemble.dir}/${appname}-pu1.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -122,7 +122,7 @@
<target name="run_se_dirs" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb2/classes:${assemble.dir}/${appname}-ejb1/classes:${assemble.dir}/${appname}-base/classes:${assemble.dir}/${appname}-pu1:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java
index 58ab5f0..9203808 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java
@@ -97,7 +97,7 @@
e.printStackTrace();
stat.addStatus("EJB embedded module 1", stat.FAIL);
} finally {
- if (c != null)
+ if (c != null)
c.close();
}
stat.addStatus("EJB embedded module 1", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java
index 280923c..e80f9f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java
@@ -17,8 +17,8 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
-import jakarta.ejb.SessionContext;
+import jakarta.ejb.Startup;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.security.PermitAll;
@@ -28,7 +28,7 @@
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/util/src/ZipUtil.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/util/src/ZipUtil.java
index 93933d1..7dd5baa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/util/src/ZipUtil.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/util/src/ZipUtil.java
@@ -43,7 +43,7 @@
e.printStackTrace();
}
}
-
+
private static final void zip(File directory, File base, ZipOutputStream zos) throws IOException {
File[] files = directory.listFiles();
byte[] buffer = new byte[8192];
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/build.xml
index 4787400..5bebb41 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/build.xml
@@ -97,9 +97,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-full tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-full tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.properties
index 8ec207a..c6f04c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-disable_nonportable_jndi"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.xml
index ffeb40a..e14d29a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.xml
@@ -29,15 +29,15 @@
&commonBuild;
&testproperties;
- <!-- note that we don't undeploy as part of all target so
+ <!-- note that we don't undeploy as part of all target so
that top-level build script can run remote2 first -->
-
+
<target name="all" depends="build,deploy,run, undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,12 +49,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -62,9 +62,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java
index aa3d791..9816aaf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java
@@ -23,7 +23,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -32,10 +32,10 @@
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -44,9 +44,9 @@
public void doTest() {
boolean failed = false;
StringBuilder sb = new StringBuilder();
- try {
+ try {
InitialContext ic = new InitialContext();
- // non-portable global
+ // non-portable global
for(String s : nonPortableJndiNames) {
try {
sb.append("About to lookup " + s);
@@ -58,9 +58,9 @@
}
}
System.out.println(sb);
- stat.addStatus("disable_nonportable_jndi", (failed ? stat.FAIL: stat.PASS));
- } catch(Exception e) {
- e.printStackTrace();
- }
+ stat.addStatus("disable_nonportable_jndi", (failed ? stat.FAIL: stat.PASS));
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java
index 610f7a4..b57fbba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java
@@ -22,7 +22,7 @@
@Stateless(mappedName="HH")
public class HelloBean implements Hello {
public String hello() {
- return "hello, world\n";
+ return "hello, world\n";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.properties
index d0d2cad..9b193e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-ear"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.xml
index 757b2b2..b10f439 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
@@ -46,8 +46,8 @@
<param name="src" value="ejb"/>
</antcall>
- <javac classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
-
+ <javac classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
+
</javac>
<!--
<antcall target="compile-common">
@@ -62,15 +62,15 @@
<param name="ejbjar.classes" value="**/Foo.class,**/Hello.class,**/HelloRemote.class,**/Singleton*.class,**/HelloStateless.class,**/HelloSingleton.class,**/FooManagedBean.class,**/BarManagedBean.class, **/FooBarManagedBean.class, **/ManagedSuper.class, **/Interceptor*.class"/>
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
<target name="run" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -79,10 +79,10 @@
<arg line="${http.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/client/Client.java
index 0a9c5d5..0e8ed2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/client/Client.java
@@ -27,7 +27,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -38,50 +38,50 @@
private static Integer appLevelViaLookup;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
- System.out.println("appLevelViaLookup = '" +
- appLevelViaLookup + "'");
+ System.out.println("appLevelViaLookup = '" +
+ appLevelViaLookup + "'");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
-
+
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java
index 4d8ca0f..0067466 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java
@@ -29,7 +29,7 @@
@PostConstruct
private void init() {
- System.out.println("In BarManagedBean::init() " + this);
+ System.out.println("In BarManagedBean::init() " + this);
}
public void bar() {
@@ -39,12 +39,12 @@
@PreDestroy
private void destroy() {
- System.out.println("In BarManagedBean::destroy() ");
+ System.out.println("In BarManagedBean::destroy() ");
}
public String toString() {
- return "BarManagedBean this = " + super.toString() +
- " s = " + s + " , ds = " + ds;
+ return "BarManagedBean this = " + super.toString() +
+ " s = " + s + " , ds = " + ds;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooBarManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooBarManagedBean.java
index 970523f..4947f16 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooBarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooBarManagedBean.java
@@ -23,12 +23,12 @@
@PostConstruct
private void init() {
- System.out.println("In FooBarManagedBean::init() " + this);
+ System.out.println("In FooBarManagedBean::init() " + this);
}
-
+
@PreDestroy
private void destroy() {
- System.out.println("In FooBarManagedBean::destroy() ");
+ System.out.println("In FooBarManagedBean::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
index ff1a453..f0411a5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
@@ -36,33 +36,33 @@
@PostConstruct
private void init() {
- System.out.println("In FooManagedBean::init() " + this);
+ System.out.println("In FooManagedBean::init() " + this);
}
-
+
public String getName() {
- return "somemanagedbean";
+ return "somemanagedbean";
}
public void foo() {
- System.out.println("In FooManagedBean::foo() ");
- bmb.bar();
+ System.out.println("In FooManagedBean::foo() ");
+ bmb.bar();
}
public Object getThis() {
- return this;
+ return this;
}
@PreDestroy
private void destroy() {
- System.out.println("In FooManagedBean::destroy() ");
+ System.out.println("In FooManagedBean::destroy() ");
}
public String toString() {
- return "FooManagedBean this = " + super.toString() +
- " s = " + s + " , orb = " + orb +
- " , bmb = " + bmb + " , em = " + em;
+ return "FooManagedBean this = " + super.toString() +
+ " s = " + s + " , orb = " + orb +
+ " , bmb = " + bmb + " , em = " + em;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java
index 9f66d01..b9dd4a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java
@@ -39,9 +39,9 @@
@Resource(name="java:module/env/MORB2")
private ORB orb;
- @Resource
+ @Resource
private FooManagedBean foo;
-
+
@Resource(name="foo2ref", mappedName="java:module/somemanagedbean")
private FooManagedBean foo2;
@@ -59,59 +59,59 @@
@EJB(name="java:app/env/appLevelEjbRef")
private Hello hello;
-
+
String appName;
String moduleName;
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("HelloSingleton::init()");
+ System.out.println("HelloSingleton::init()");
- System.out.println("myString = '" + myString + "'");
- if( (myString == null) || !(myString.equals("myString") ) ) {
- throw new RuntimeException("Invalid value " + myString + " for myString");
- }
+ System.out.println("myString = '" + myString + "'");
+ if( (myString == null) || !(myString.equals("myString") ) ) {
+ throw new RuntimeException("Invalid value " + myString + " for myString");
+ }
- appName = (String) sessionCtx.lookup("java:app/AppName");
- moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
+ appName = (String) sessionCtx.lookup("java:app/AppName");
+ moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
- ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
- ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
+ ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
+ ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
- System.out.println("AppName = " + appName);
- System.out.println("ModuleName = " + moduleName);
+ System.out.println("AppName = " + appName);
+ System.out.println("ModuleName = " + moduleName);
- foo4 = (FooManagedBean) sessionCtx.lookup("java:module/somemanagedbean");
- foo5 = (FooManagedBean) sessionCtx.lookup("java:app/" + moduleName +
- "/somemanagedbean");
- foo6 = (Foo) sessionCtx.lookup("java:app/" + moduleName +
- "/somemanagedbean");
- foo7 = (FooManagedBean) sessionCtx.lookup("java:comp/env/foo2ref");
- foo8 = (Foo) sessionCtx.lookup("java:comp/env/foo3ref");
+ foo4 = (FooManagedBean) sessionCtx.lookup("java:module/somemanagedbean");
+ foo5 = (FooManagedBean) sessionCtx.lookup("java:app/" + moduleName +
+ "/somemanagedbean");
+ foo6 = (Foo) sessionCtx.lookup("java:app/" + moduleName +
+ "/somemanagedbean");
+ foo7 = (FooManagedBean) sessionCtx.lookup("java:comp/env/foo2ref");
+ foo8 = (Foo) sessionCtx.lookup("java:comp/env/foo3ref");
}
public String hello() {
-
- System.out.println("HelloSingleton::hello()");
+
+ System.out.println("HelloSingleton::hello()");
- foo.foo();
- foo2.foo();
- foo3.foo();
+ foo.foo();
+ foo2.foo();
+ foo3.foo();
- foo4.foo();
- foo5.foo();
- foo6.foo();
- foo7.foo();
- foo8.foo();
+ foo4.foo();
+ foo5.foo();
+ foo6.foo();
+ foo7.foo();
+ foo8.foo();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
private void destroy() {
- System.out.println("HelloSingleton::destroy()");
+ System.out.println("HelloSingleton::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java
index 3504771..18f55ea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java
@@ -30,7 +30,7 @@
@Resource(name="java:module/MORB1")
private ORB orb;
-
+
@EJB(name="lookupref1", lookup="java:app/env/AS1")
private Hello lookupref1;
@@ -41,51 +41,51 @@
private HelloRemote lookupref3;
// declare component-level dependency using fully-qualified
- // java:comp/env form.
+ // java:comp/env form.
@Resource(name="java:comp/env/foo") SessionContext sessionCtx;
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("HelloStateless::init()");
+ System.out.println("HelloStateless::init()");
}
public String hello() {
- System.out.println("In HelloStateless::hello()");
+ System.out.println("In HelloStateless::hello()");
- String appName = (String) sessionCtx.lookup("java:app/AppName");
- String moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
- System.out.println("AppName = " + appName);
- System.out.println("ModuleName = " + moduleName);
+ String appName = (String) sessionCtx.lookup("java:app/AppName");
+ String moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
+ System.out.println("AppName = " + appName);
+ System.out.println("ModuleName = " + moduleName);
- ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
- ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
+ ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
+ ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
- Hello s1 = (Hello) sessionCtx.lookup("java:global/" +
- appName + "/" +
- moduleName + "/" +
- "HelloSingleton");
+ Hello s1 = (Hello) sessionCtx.lookup("java:global/" +
+ appName + "/" +
+ moduleName + "/" +
+ "HelloSingleton");
- Hello s2 = (Hello) sessionCtx.lookup("java:app/" +
- moduleName + "/" +
- "HelloSingleton");
+ Hello s2 = (Hello) sessionCtx.lookup("java:app/" +
+ moduleName + "/" +
+ "HelloSingleton");
- // Rely on default to resolve "java:comp/env/ declared resource
- SessionContext sc1 = (SessionContext)
- sessionCtx.lookup("foo");
+ // Rely on default to resolve "java:comp/env/ declared resource
+ SessionContext sc1 = (SessionContext)
+ sessionCtx.lookup("foo");
- SessionContext sc2 = (SessionContext)
- sc1.lookup("java:comp/env/foo");
+ SessionContext sc2 = (SessionContext)
+ sc1.lookup("java:comp/env/foo");
- Integer envEntry = (Integer)
- sc1.lookup("java:app/env/value1");
- System.out.println("java:ap/env/value1 = " + envEntry);
+ Integer envEntry = (Integer)
+ sc1.lookup("java:app/env/value1");
+ System.out.println("java:ap/env/value1 = " + envEntry);
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
private void destroy() {
- System.out.println("HelloStateless::destroy()");
+ System.out.println("HelloStateless::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
index 7307cae..f59afd5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
@@ -35,21 +35,21 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::init() ");
- c.proceed();
+ System.out.println("In InterceptorA::init() ");
+ c.proceed();
}
@AroundInvoke
public Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::roundInvoke() ");
- return c.proceed();
+ System.out.println("In InterceptorA::roundInvoke() ");
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In Interceptor::destroy() ");
- c.proceed();
+ System.out.println("In Interceptor::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorSuper.java
index 4adbd03..1b9325f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorSuper.java
@@ -24,7 +24,7 @@
@AroundInvoke
protected Object roundInvoke(InvocationContext c) throws Exception {
- throw new RuntimeException("Should not reach here");
+ throw new RuntimeException("Should not reach here");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java
index de1e35a..4b6e0d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java
@@ -28,17 +28,17 @@
@PostConstruct
private void init() {
- System.out.println("In ManagedSuper::init() " + this);
+ System.out.println("In ManagedSuper::init() " + this);
}
@PreDestroy
private void destroy() {
- System.out.println("In ManagedSuper::destroy() ");
+ System.out.println("In ManagedSuper::destroy() ");
}
public String toString() {
- return "ManagedSuper this = " + super.toString() +
- " s = " + s + " , ds = " + ds;
+ return "ManagedSuper this = " + super.toString() +
+ " s = " + s + " , ds = " + ds;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java
index 53ecd16..628f744 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java
@@ -28,7 +28,7 @@
public void init() {
System.out.println("In SingletonBean2::init()");
}
-
+
@PreDestroy
public void destroy() {
System.out.println("In SingletonBean2::destroy()");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java
index 6449f7a..a36bbe7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java
@@ -28,7 +28,7 @@
public void init() {
System.out.println("In SingletonBean3::init()");
}
-
+
@PreDestroy
public void destroy() {
System.out.println("In SingletonBean3::destroy()");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java
index 43e649a..b6e204c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java
@@ -27,7 +27,7 @@
public void init() {
System.out.println("In SingletonBean4::init()");
}
-
+
@PreDestroy
public void destroy() {
System.out.println("In SingletonBean4::destroy()");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
index 9bfc8b0..c457d1d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
@@ -33,28 +33,28 @@
@PostConstruct
private void init() {
- System.out.println("In Foo2ManagedBean::init() " + this);
+ System.out.println("In Foo2ManagedBean::init() " + this);
}
-
+
public void foo() {
- System.out.println("In Foo2ManagedBean::foo() ");
- System.out.println("In Foo2ManagedBean::foo() testing @EJB: " + s.hello());
+ System.out.println("In Foo2ManagedBean::foo() ");
+ System.out.println("In Foo2ManagedBean::foo() testing @EJB: " + s.hello());
}
public Object getThis() {
- return this;
+ return this;
}
@PreDestroy
private void destroy() {
- System.out.println("In Foo2ManagedBean::destroy() ");
+ System.out.println("In Foo2ManagedBean::destroy() ");
}
public String toString() {
- return "Foo2ManagedBean this = " +
- " s = " + s + " , orb = " + orb +
- " , em = " + em;
+ return "Foo2ManagedBean this = " +
+ " s = " + s + " , orb = " + orb +
+ " , em = " + em;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/FooBarManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/FooBarManagedBean.java
index 970523f..4947f16 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/FooBarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/FooBarManagedBean.java
@@ -23,12 +23,12 @@
@PostConstruct
private void init() {
- System.out.println("In FooBarManagedBean::init() " + this);
+ System.out.println("In FooBarManagedBean::init() " + this);
}
-
+
@PreDestroy
private void destroy() {
- System.out.println("In FooBarManagedBean::destroy() ");
+ System.out.println("In FooBarManagedBean::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java
index f9f954e..ba20136 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java
@@ -34,7 +34,7 @@
@PreDestroy
private void destroy() {
- System.out.println("HelloS::destroy()");
+ System.out.println("HelloS::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java
index ab6c19f..5362845 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java
@@ -32,7 +32,7 @@
@PreDestroy
private void destroy() {
- System.out.println("HelloS2::destroy()");
+ System.out.println("HelloS2::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java
index 5212832..3ce19b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java
@@ -63,9 +63,9 @@
private HelloRemote stateless1;
private HelloRemote stateless2;
- @Resource
+ @Resource
private Foo2ManagedBean foo;
-
+
@Resource(name="foo2ref", mappedName="java:module/somemanagedbean")
private Foo2ManagedBean foo2;
@@ -82,112 +82,112 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
- System.out.println("myString = '" + myString + "'");
- if( (myString == null) || !(myString.equals("myString") ) ) {
- throw new RuntimeException("Invalid value " + myString + " for myString");
- }
+ System.out.println("In HelloServlet::init");
+ System.out.println("myString = '" + myString + "'");
+ if( (myString == null) || !(myString.equals("myString") ) ) {
+ throw new RuntimeException("Invalid value " + myString + " for myString");
+ }
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- try {
-
- InitialContext ic = new InitialContext();
+ try {
- String appName = (String) ic.lookup("java:app/AppName");
- String moduleName = (String) ic.lookup("java:module/ModuleName");
+ InitialContext ic = new InitialContext();
- // lookup via intermediate context
- Context appCtx = (Context) ic.lookup("java:app");
- Context appCtxEnv = (Context) appCtx.lookup("env");
- stateless2 = (HelloRemote) appCtxEnv.lookup("AS2");
- NamingEnumeration<Binding> bindings = appCtxEnv.listBindings("");
- System.out.println("java:app/env/ bindings ");
- while(bindings.hasMore()) {
- System.out.println("binding : " + bindings.next().getName());
- }
+ String appName = (String) ic.lookup("java:app/AppName");
+ String moduleName = (String) ic.lookup("java:module/ModuleName");
+
+ // lookup via intermediate context
+ Context appCtx = (Context) ic.lookup("java:app");
+ Context appCtxEnv = (Context) appCtx.lookup("env");
+ stateless2 = (HelloRemote) appCtxEnv.lookup("AS2");
+ NamingEnumeration<Binding> bindings = appCtxEnv.listBindings("");
+ System.out.println("java:app/env/ bindings ");
+ while(bindings.hasMore()) {
+ System.out.println("binding : " + bindings.next().getName());
+ }
- foo4 = (Foo2ManagedBean) ic.lookup("java:module/somemanagedbean");
- foo5 = (Foo2ManagedBean) ic.lookup("java:app/" + moduleName +
- "/somemanagedbean");
- foo6 = (Foo) ic.lookup("java:app/ejb-ejb31-full-ear-ejb/somemanagedbean");
- foo7 = (Foo2ManagedBean) ic.lookup("java:comp/env/foo2ref");
- foo8 = (Foo) ic.lookup("java:comp/env/foo3ref");
+ foo4 = (Foo2ManagedBean) ic.lookup("java:module/somemanagedbean");
+ foo5 = (Foo2ManagedBean) ic.lookup("java:app/" + moduleName +
+ "/somemanagedbean");
+ foo6 = (Foo) ic.lookup("java:app/ejb-ejb31-full-ear-ejb/somemanagedbean");
+ foo7 = (Foo2ManagedBean) ic.lookup("java:comp/env/foo2ref");
+ foo8 = (Foo) ic.lookup("java:comp/env/foo3ref");
- singleton1 = (Hello) ic.lookup("java:module/m1");
+ singleton1 = (Hello) ic.lookup("java:module/m1");
- // standard java:app name for ejb
- singleton2 = (Hello) ic.lookup("java:app/ejb-ejb31-full-ear-ejb/HelloSingleton");
+ // standard java:app name for ejb
+ singleton2 = (Hello) ic.lookup("java:app/ejb-ejb31-full-ear-ejb/HelloSingleton");
- singleton3 = (Hello) ic.lookup("java:global/" + appName + "/ejb-ejb31-full-ear-ejb/HelloSingleton");
+ singleton3 = (Hello) ic.lookup("java:global/" + appName + "/ejb-ejb31-full-ear-ejb/HelloSingleton");
- // lookup some java:app defined by ejb-jar
- singleton4 = (Hello) ic.lookup("java:app/env/AS1");
+ // lookup some java:app defined by ejb-jar
+ singleton4 = (Hello) ic.lookup("java:app/env/AS1");
- // global dependency
- singleton5 = (Hello) ic.lookup("java:global/GS1");
+ // global dependency
+ singleton5 = (Hello) ic.lookup("java:global/GS1");
- stateless1 = (HelloRemote) ic.lookup("java:app/env/AS2");
+ stateless1 = (HelloRemote) ic.lookup("java:app/env/AS2");
- System.out.println("My AppName = " +
- ic.lookup("java:app/AppName"));
+ System.out.println("My AppName = " +
+ ic.lookup("java:app/AppName"));
- System.out.println("My ModuleName = " +
- ic.lookup("java:module/ModuleName"));
+ System.out.println("My ModuleName = " +
+ ic.lookup("java:module/ModuleName"));
- try {
- org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) ic.lookup("java:module/MORB1");
- throw new RuntimeException("Should have gotten naming exception");
- } catch(NamingException ne) {
- System.out.println("Successfully was *not* able to see ejb-jar module-level dependency");
- }
+ try {
+ org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) ic.lookup("java:module/MORB1");
+ throw new RuntimeException("Should have gotten naming exception");
+ } catch(NamingException ne) {
+ System.out.println("Successfully was *not* able to see ejb-jar module-level dependency");
+ }
- } catch(Exception e) {
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
- foo.foo();
- foo2.foo();
- foo3.foo();
+ foo.foo();
+ foo2.foo();
+ foo3.foo();
- foo4.foo();
- foo5.foo();
- foo6.foo();
- foo7.foo();
- foo8.foo();
+ foo4.foo();
+ foo5.foo();
+ foo6.foo();
+ foo7.foo();
+ foo8.foo();
- m1.hello();
- a1.hello();
- a2.hello();
- singleton1.hello();
- singleton2.hello();
- singleton3.hello();
- singleton4.hello();
- singleton5.hello();
+ m1.hello();
+ a1.hello();
+ a2.hello();
+ singleton1.hello();
+ singleton2.hello();
+ singleton3.hello();
+ singleton4.hello();
+ singleton5.hello();
- stateless1.hello();
- stateless2.hello();
+ stateless1.hello();
+ stateless2.hello();
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.properties
index af1ceb8..4b1470c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-jcdifull"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.xml
index 014811e..e7bde49 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<mkdir dir="${build.classes.dir}"/>
<javac classpath="${env.S1AS_HOME}/modules/weld-osgi-bundle.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="ejb" destdir="${build.classes.dir}" debug="on" failonerror="true" includeantruntime="false" >
@@ -43,23 +43,23 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true">
<metainf dir="descriptor">
<include name="beans.xml"/>
- </metainf>
+ </metainf>
</jar>
- <!-- do client compile after so the classes aren't part of ejb-jar -->
+ <!-- do client compile after so the classes aren't part of ejb-jar -->
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -67,9 +67,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -81,7 +81,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java
index a761d29..509b175 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java
@@ -26,37 +26,37 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest(args[1]);
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest(args[1]);
stat.printSummary(appName + "ID");
}
- public Client(String[] args) {
+ public Client(String[] args) {
}
public void doTest(String otherApp) {
- try {
+ try {
- SingletonRemote singleton = (SingletonRemote) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+ SingletonRemote singleton = (SingletonRemote) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
- singleton.hello();
+ singleton.hello();
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
index c978178..e8f1b9e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
@@ -29,7 +29,7 @@
@Resource(name="jdbc/__default") javax.sql.DataSource ds;
public Bar() {
- System.out.println("Constructed::Bar");
+ System.out.println("Constructed::Bar");
}
@PostConstruct
@@ -46,7 +46,7 @@
}
public String toString() {
- return "Bar";
+ return "Bar";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar2.java
index 5bed5c2..9725e5d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar2.java
@@ -19,11 +19,11 @@
public class Bar2 {
public Bar2() {
- System.out.println("Constructed::Bar2");
+ System.out.println("Constructed::Bar2");
}
public String toString() {
- return "Bar2";
+ return "Bar2";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
index 67545e2..23458fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
@@ -28,7 +28,7 @@
private javax.sql.DataSource ds;
public DependentWithInjectedDataSource() {
- System.out.println("Constructed::DependentWithInjectedDataSource");
+ System.out.println("Constructed::DependentWithInjectedDataSource");
}
@PostConstruct
@@ -40,7 +40,7 @@
}
public String toString() {
- return "DependentWithInjectedDataSource";
+ return "DependentWithInjectedDataSource";
}
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Foo.java
index e02a306..98e596a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Foo.java
@@ -26,12 +26,12 @@
int id = 0;
public Foo() {
- id = count;
- count++;
+ id = count;
+ count++;
}
public String toString() {
- return "Foo" + id;
+ return "Foo" + id;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooManagedBean.java
index 0d2b830..3739d45 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooManagedBean.java
@@ -35,27 +35,27 @@
@PostConstruct
private void init() {
- System.out.println("In FooManagedBean:init()");
- System.out.println("orb = " + orb);
- if( orb == null ) {
- throw new RuntimeException("null orb");
- }
+ System.out.println("In FooManagedBean:init()");
+ System.out.println("orb = " + orb);
+ if( orb == null ) {
+ throw new RuntimeException("null orb");
+ }
}
public void hello() {
- System.out.println("In FooManagedBean::hello()");
+ System.out.println("In FooManagedBean::hello()");
}
public void assertInterceptorBinding() {
- if( !interceptorWasHere ) {
- throw new RuntimeException("interceptor was not here");
- }
+ if( !interceptorWasHere ) {
+ throw new RuntimeException("interceptor was not here");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In FooManagedBean:destroy()");
+ System.out.println("In FooManagedBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooNonManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooNonManagedBean.java
index 94ffc96..58af079 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooNonManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooNonManagedBean.java
@@ -29,20 +29,20 @@
@PostConstruct
private void init() {
- System.out.println("In FooNonManagedBean:init()");
- System.out.println("orb = " + orb);
- if( orb == null ) {
- throw new RuntimeException("null orb");
- }
+ System.out.println("In FooNonManagedBean:init()");
+ System.out.println("orb = " + orb);
+ if( orb == null ) {
+ throw new RuntimeException("null orb");
+ }
}
public void hello() {
- System.out.println("In FooNonManagedBean::hello()");
+ System.out.println("In FooNonManagedBean::hello()");
}
@PreDestroy
private void destroy() {
- System.out.println("In FooNonManagedBean:destroy()");
+ System.out.println("In FooNonManagedBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/InterceptorA.java
index b6f03ec..8311c02 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/InterceptorA.java
@@ -26,25 +26,25 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.err.println("In InterceptorA::init() ");
- c.proceed();
+ System.err.println("In InterceptorA::init() ");
+ c.proceed();
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.err.println("===> In InterceptorA::aroundInvoke() ");
+ System.err.println("===> In InterceptorA::aroundInvoke() ");
if ((c.getTarget() instanceof StatelessBean) && c.getMethod().getName().equals("hello")) {
StatelessBean sb = (StatelessBean)c.getTarget();
sb.interceptorCalled(0);
}
- return c.proceed();
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.err.println("In InterceptorA::destroy() ");
- c.proceed();
+ System.err.println("In InterceptorA::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceParser.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceParser.java
index d401cce..1168eaa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceParser.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceParser.java
@@ -19,12 +19,12 @@
import java.util.Arrays;
import java.util.List;
-public class SentenceParser
-{
-
- public List<String> parse(String text)
+public class SentenceParser
+{
+
+ public List<String> parse(String text)
{
return Arrays.asList( text.split("[.?]") );
}
-
-}
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java
index 76f0773..a4dd92b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java
@@ -19,12 +19,12 @@
import jakarta.ejb.Stateless;
@Stateless
-public class SentenceTranslator implements Translator
-{
-
- public String translate(String sentence)
- {
- return "Lorem ipsum dolor sit amet";
+public class SentenceTranslator implements Translator
+{
+
+ public String translate(String sentence)
+ {
+ return "Lorem ipsum dolor sit amet";
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
index 8d853a2..08d0dac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
@@ -38,14 +38,14 @@
@Inject
private Event<SomeEvent> someEvent;
-
+
@Inject Foo foo;
@EJB
- private StatelessLocal statelessEE;
+ private StatelessLocal statelessEE;
@Inject
- private StatelessLocal2 sl2;
+ private StatelessLocal2 sl2;
@Inject private TranslatorController tc;
@@ -54,52 +54,52 @@
@Resource
private BeanManager beanManagerInject;
-
+
@Resource SessionContext sesCtx;
@PostConstruct
public void init() {
System.out.println("In SingletonBean::init()");
- if( beanManagerInject == null ) {
- throw new EJBException("BeanManager is null");
- }
- System.out.println("Bean manager inject = " + beanManagerInject);
- testIMCreateDestroyMO();
+ if( beanManagerInject == null ) {
+ throw new EJBException("BeanManager is null");
+ }
+ System.out.println("Bean manager inject = " + beanManagerInject);
+ testIMCreateDestroyMO();
- System.out.println("Sending some event...");
- someEvent.fire( new SomeEvent(2) );
+ System.out.println("Sending some event...");
+ someEvent.fire( new SomeEvent(2) );
}
public void hello() {
- System.out.println("In SingletonBean::hello() " + foo);
- statelessEE.hello();
- sl2.hello();
+ System.out.println("In SingletonBean::hello() " + foo);
+ statelessEE.hello();
+ sl2.hello();
- fmb.hello();
-
- BeanManager beanMgr = (BeanManager)
- sesCtx.lookup("java:comp/BeanManager");
+ fmb.hello();
+
+ BeanManager beanMgr = (BeanManager)
+ sesCtx.lookup("java:comp/BeanManager");
- System.out.println("Successfully retrieved bean manager " +
- beanMgr + " for JCDI enabled app");
+ System.out.println("Successfully retrieved bean manager " +
+ beanMgr + " for JCDI enabled app");
- /**
- StatefulBean sb = (StatefulBean) sesCtx.lookup("java:module/StatefulBean");
- System.out.println("In SingletonBean sb = " + sb);
- sb.hello();
- **/
+ /**
+ StatefulBean sb = (StatefulBean) sesCtx.lookup("java:module/StatefulBean");
+ System.out.println("In SingletonBean sb = " + sb);
+ sb.hello();
+ **/
}
@Schedule(second="*/10", minute="*", hour="*")
- private void timeout() {
- System.out.println("In SingletonBean::timeout() " + foo);
+ private void timeout() {
+ System.out.println("In SingletonBean::timeout() " + foo);
- System.out.println("tc.getText() = " + tc.getText());
+ System.out.println("tc.getText() = " + tc.getText());
- statelessEE.hello();
+ statelessEE.hello();
}
@PreDestroy
@@ -109,29 +109,29 @@
private void testIMCreateDestroyMO() {
- try {
+ try {
- // Test InjectionManager managed bean functionality
- Object injectionMgr = new InitialContext().lookup("com.sun.enterprise.container.common.spi.util.InjectionManager");
- Method createManagedMethod = injectionMgr.getClass().getMethod("createManagedObject", java.lang.Class.class);
- System.out.println("create managed object method = " + createManagedMethod);
- FooManagedBean f2 = (FooManagedBean) createManagedMethod.invoke(injectionMgr, FooManagedBean.class);
- f2.hello();
-
-
- Method destroyManagedMethod = injectionMgr.getClass().getMethod("destroyManagedObject", java.lang.Object.class);
- System.out.println("destroy managed object method = " + destroyManagedMethod);
- destroyManagedMethod.invoke(injectionMgr, f2);
-
- FooNonManagedBean nonF = (FooNonManagedBean) createManagedMethod.invoke(injectionMgr, FooNonManagedBean.class);
- System.out.println("FooNonManagedBean = " + nonF);
- nonF.hello();
- destroyManagedMethod.invoke(injectionMgr, nonF);
+ // Test InjectionManager managed bean functionality
+ Object injectionMgr = new InitialContext().lookup("com.sun.enterprise.container.common.spi.util.InjectionManager");
+ Method createManagedMethod = injectionMgr.getClass().getMethod("createManagedObject", java.lang.Class.class);
+ System.out.println("create managed object method = " + createManagedMethod);
+ FooManagedBean f2 = (FooManagedBean) createManagedMethod.invoke(injectionMgr, FooManagedBean.class);
+ f2.hello();
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ Method destroyManagedMethod = injectionMgr.getClass().getMethod("destroyManagedObject", java.lang.Object.class);
+ System.out.println("destroy managed object method = " + destroyManagedMethod);
+ destroyManagedMethod.invoke(injectionMgr, f2);
+
+ FooNonManagedBean nonF = (FooNonManagedBean) createManagedMethod.invoke(injectionMgr, FooNonManagedBean.class);
+ System.out.println("FooNonManagedBean = " + nonF);
+ nonF.hello();
+ destroyManagedMethod.invoke(injectionMgr, nonF);
+
+
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
index 53899e3..736c486 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
@@ -40,15 +40,15 @@
@Inject
public SingletonBean2(Event<SomeEvent> se) {
- someEvent = se;
- System.out.println("In SingletonBean2 someEvent = " + someEvent);
-
+ someEvent = se;
+ System.out.println("In SingletonBean2 someEvent = " + someEvent);
+
}
@Inject Foo foo;
@EJB
- private StatelessLocal statelessEE;
+ private StatelessLocal statelessEE;
@Inject private TranslatorController tc;
@@ -59,45 +59,45 @@
@Resource
private BeanManager beanManagerInject;
-
+
@Resource SessionContext sesCtx;
@PostConstruct
public void init() {
System.out.println("In SingletonBean2::init()");
- if( beanManagerInject == null ) {
- throw new EJBException("BeanManager is null");
- }
- System.out.println("Bean manager inject = " + beanManagerInject);
- testIMCreateDestroyMO();
- testSingletonWithInjectionConstructor();
+ if( beanManagerInject == null ) {
+ throw new EJBException("BeanManager is null");
+ }
+ System.out.println("Bean manager inject = " + beanManagerInject);
+ testIMCreateDestroyMO();
+ testSingletonWithInjectionConstructor();
- System.out.println("Sending some event...");
- someEvent.fire( new SomeEvent(2) );
+ System.out.println("Sending some event...");
+ someEvent.fire( new SomeEvent(2) );
}
public void hello() {
- System.out.println("In SingletonBean2::hello() " + foo);
- statelessEE.hello();
+ System.out.println("In SingletonBean2::hello() " + foo);
+ statelessEE.hello();
- fmb.hello();
-
- BeanManager beanMgr = (BeanManager)
- sesCtx.lookup("java:comp/BeanManager");
-
- System.out.println("Successfully retrieved bean manager " +
- beanMgr + " for JCDI enabled app");
-
+ fmb.hello();
+
+ BeanManager beanMgr = (BeanManager)
+ sesCtx.lookup("java:comp/BeanManager");
+
+ System.out.println("Successfully retrieved bean manager " +
+ beanMgr + " for JCDI enabled app");
+
}
@Schedule(second="*/10", minute="*", hour="*")
- private void timeout() {
- System.out.println("In SingletonBean::timeout() " + foo);
+ private void timeout() {
+ System.out.println("In SingletonBean::timeout() " + foo);
- System.out.println("tc.getText() = " + tc.getText());
+ System.out.println("tc.getText() = " + tc.getText());
- statelessEE.hello();
+ statelessEE.hello();
}
@PreDestroy
@@ -107,29 +107,29 @@
private void testIMCreateDestroyMO() {
- try {
+ try {
- // Test InjectionManager managed bean functionality
- Object injectionMgr = new InitialContext().lookup("com.sun.enterprise.container.common.spi.util.InjectionManager");
- Method createManagedMethod = injectionMgr.getClass().getMethod("createManagedObject", java.lang.Class.class);
- System.out.println("create managed object method = " + createManagedMethod);
- FooManagedBean f2 = (FooManagedBean) createManagedMethod.invoke(injectionMgr, FooManagedBean.class);
- f2.hello();
-
-
- Method destroyManagedMethod = injectionMgr.getClass().getMethod("destroyManagedObject", java.lang.Object.class);
- System.out.println("destroy managed object method = " + destroyManagedMethod);
- destroyManagedMethod.invoke(injectionMgr, f2);
-
- FooNonManagedBean nonF = (FooNonManagedBean) createManagedMethod.invoke(injectionMgr, FooNonManagedBean.class);
- System.out.println("FooNonManagedBean = " + nonF);
- nonF.hello();
- destroyManagedMethod.invoke(injectionMgr, nonF);
+ // Test InjectionManager managed bean functionality
+ Object injectionMgr = new InitialContext().lookup("com.sun.enterprise.container.common.spi.util.InjectionManager");
+ Method createManagedMethod = injectionMgr.getClass().getMethod("createManagedObject", java.lang.Class.class);
+ System.out.println("create managed object method = " + createManagedMethod);
+ FooManagedBean f2 = (FooManagedBean) createManagedMethod.invoke(injectionMgr, FooManagedBean.class);
+ f2.hello();
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ Method destroyManagedMethod = injectionMgr.getClass().getMethod("destroyManagedObject", java.lang.Object.class);
+ System.out.println("destroy managed object method = " + destroyManagedMethod);
+ destroyManagedMethod.invoke(injectionMgr, f2);
+
+ FooNonManagedBean nonF = (FooNonManagedBean) createManagedMethod.invoke(injectionMgr, FooNonManagedBean.class);
+ System.out.println("FooNonManagedBean = " + nonF);
+ nonF.hello();
+ destroyManagedMethod.invoke(injectionMgr, nonF);
+
+
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
}
@@ -137,16 +137,16 @@
private void testSingletonWithInjectionConstructor() {
- try {
+ try {
- SingletonBeanA b= (SingletonBeanA) sesCtx.lookup("java:module/SingletonBeanA");
+ SingletonBeanA b= (SingletonBeanA) sesCtx.lookup("java:module/SingletonBeanA");
if (b.getBar() == null) {
throw new Exception("Bar is null");
}
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
index f329c4c..a96b70f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
@@ -28,7 +28,7 @@
Bar bar;
- @Inject
+ @Inject
public SingletonBeanA(Bar bar) {
this.bar = bar;
}
@@ -36,10 +36,10 @@
@PostConstruct
public void init() {
System.out.println("In SingletonBeanA::init()");
- if( bar == null ) {
- throw new EJBException("bar is null");
- }
- System.out.println("bar inject = " + bar);
+ if( bar == null ) {
+ throw new EJBException("bar is null");
+ }
+ System.out.println("bar inject = " + bar);
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
index 9bf9c4e..0581314 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
@@ -31,7 +31,7 @@
@Inject
public SingletonStartupWithInjectedDependent(DependentWithInjectedDataSource service) {
this.service = service;
- System.out.println("Constructed::SingletonStartupWithInjectedDependent");
+ System.out.println("Constructed::SingletonStartupWithInjectedDependent");
}
@PostConstruct
@@ -41,7 +41,7 @@
}
public String toString() {
- return "SingletonStartupWithInjectedDependent";
+ return "SingletonStartupWithInjectedDependent";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SomeEvent.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SomeEvent.java
index 8b417fc..584caab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SomeEvent.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SomeEvent.java
@@ -20,11 +20,11 @@
private int someInt;
- public SomeEvent(int i) {
- someInt = i;
+ public SomeEvent(int i) {
+ someInt = i;
}
public String toString() {
- return "" + someInt;
+ return "" + someInt;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
index 2d52c2a..9678831 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
@@ -40,18 +40,18 @@
@Inject Foo foo;
@PostConstruct
- public void init() {
- System.out.println("In StatelessBean::init()");
+ public void init() {
+ System.out.println("In StatelessBean::init()");
}
public void processSomeEvent(@Observes SomeEvent event) {
- System.out.println("In StatelessBean::processSomeEvent " +
- event);
+ System.out.println("In StatelessBean::processSomeEvent " +
+ event);
}
public void hello() {
- System.out.println("In StatelessBean::hello() " +
- foo);
+ System.out.println("In StatelessBean::hello() " +
+ foo);
if (interceptorIds.size() != 2) {
throw new IllegalStateException("Wrong number of interceptors were called: expected 2, got " + interceptorIds.size());
} else if (interceptorIds.get(0) != 0 || interceptorIds.get(1) != 1) {
@@ -64,15 +64,15 @@
@ExcludeClassInterceptors
@ExcludeDefaultInterceptors
public void interceptorCalled(int id) {
- System.out.println("In StatelessBean::interceptorCalled() " + id);
+ System.out.println("In StatelessBean::interceptorCalled() " + id);
interceptorIds.add(id);
}
@PreDestroy
- public void destroy() {
- System.out.println("In StatelessBean::destroy()");
+ public void destroy() {
+ System.out.println("In StatelessBean::destroy()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
index 91f205d..d36d2b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
@@ -29,27 +29,27 @@
private Foo foo;
@Inject
- public StatelessBean2(Foo f, Foo sr) {
- foo = f;
- System.out.println("In StatelessBean2() foo = " + foo +
- " sr = " + sr);
+ public StatelessBean2(Foo f, Foo sr) {
+ foo = f;
+ System.out.println("In StatelessBean2() foo = " + foo +
+ " sr = " + sr);
}
@PostConstruct
- public void init() {
- System.out.println("In StatelessBean2::init()");
+ public void init() {
+ System.out.println("In StatelessBean2::init()");
}
public void hello() {
- System.out.println("In StatelessBean2::hello() " +
- foo);
+ System.out.println("In StatelessBean2::hello() " +
+ foo);
}
@PreDestroy
- public void destroy() {
- System.out.println("In StatelessBean2::destroy()");
+ public void destroy() {
+ System.out.println("In StatelessBean2::destroy()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
index 7610bbf..1d77ec8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
@@ -22,25 +22,25 @@
import jakarta.inject.Inject;
public class TextTranslator implements Serializable
-{
- private SentenceParser sentenceParser;
-
+{
+ private SentenceParser sentenceParser;
+
@EJB Translator translator;
-
+
@Inject
- public TextTranslator(SentenceParser sentenceParser)
- {
- this.sentenceParser = sentenceParser;
+ public TextTranslator(SentenceParser sentenceParser)
+ {
+ this.sentenceParser = sentenceParser;
}
-
- public String translate(String text)
- {
- StringBuilder sb = new StringBuilder();
- for (String sentence: sentenceParser.parse(text))
- {
- sb.append(translator.translate(sentence)).append(". ");
- }
- return sb.toString().trim();
+
+ public String translate(String text)
+ {
+ StringBuilder sb = new StringBuilder();
+ for (String sentence: sentenceParser.parse(text))
+ {
+ sb.append(translator.translate(sentence)).append(". ");
+ }
+ return sb.toString().trim();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java
index 057830c..af49a41 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java
@@ -18,10 +18,10 @@
import jakarta.ejb.Local;
-@Local
-public interface Translator
-{
+@Local
+public interface Translator
+{
public String translate(String sentence);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController.java
index a329106..5556a88 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController.java
@@ -18,15 +18,15 @@
public interface TranslatorController
{
-
+
public String getText();
-
+
public void setText(String text);
-
+
public void translate();
-
+
public String getTranslatedText();
-
+
public void remove();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController2.java
index 3b101d4..007e269 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController2.java
@@ -18,7 +18,7 @@
public interface TranslatorController2
{
-
+
public void foo();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
index 97750ee..209b522 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
@@ -25,42 +25,42 @@
@Stateful
@RequestScoped
@Named("translator")
- public class TranslatorControllerBean implements TranslatorController , TranslatorController2
+ public class TranslatorControllerBean implements TranslatorController , TranslatorController2
{
-
+
@Inject
private TextTranslator translator;
-
+
private String inputText;
-
+
private String translatedText;
-
+
public String getText()
{
return inputText;
}
-
+
public void setText(String text)
{
this.inputText = text;
}
-
+
public void translate()
{
translatedText = translator.translate(inputText);
}
-
+
public String getTranslatedText()
{
return translatedText;
}
public void foo() {}
-
+
@Remove
public void remove()
{
-
+
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.properties
index b267ead..bf7ad25 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-passact"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.xml
index cb051eb..181bb06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.xml
@@ -29,15 +29,15 @@
&commonBuild;
&testproperties;
- <!-- note that we don't undeploy as part of all target so
+ <!-- note that we don't undeploy as part of all target so
that top-level build script can run remote2 first -->
-
+
<target name="all" depends="build,deploy,run,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,12 +49,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -62,9 +62,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java
index 0e5499c..4a9014c2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java
@@ -31,17 +31,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -49,44 +49,44 @@
public void doTest() {
- try {
- int numHellos = 8; // 8 is the batch size, so 8 should be guaranteed to be pasivated
+ try {
+ int numHellos = 8; // 8 is the batch size, so 8 should be guaranteed to be pasivated
- Hello[] hellos = new Hello[numHellos];
- int passivationCount = 0;
+ Hello[] hellos = new Hello[numHellos];
+ int passivationCount = 0;
- for(int i = 0; i < numHellos; i++) {
-
- hellos[i] = (Hello) new InitialContext().lookup("java:global/"+appName+"/HelloBean");
- hellos[i].hello();
- }
+ for(int i = 0; i < numHellos; i++) {
- try {
- System.out.println("Waiting for passivation...");
- Thread.sleep(20000);
- } catch(Exception e) {
- e.printStackTrace();
- }
+ hellos[i] = (Hello) new InitialContext().lookup("java:global/"+appName+"/HelloBean");
+ hellos[i].hello();
+ }
- for(int i = 0; i < numHellos; i++) {
-
- hellos[i].hello();
- if( hellos[i].passivatedAndActivated() ) {
- passivationCount++;
- }
- }
+ try {
+ System.out.println("Waiting for passivation...");
+ Thread.sleep(20000);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
- if( passivationCount != numHellos ) {
- System.out.println("Passivation failed -- count = " + passivationCount + " instead of expected " + numHellos);
- throw new EJBException("passivation failed");
- }
+ for(int i = 0; i < numHellos; i++) {
- stat.addStatus("local main", stat.PASS);
+ hellos[i].hello();
+ if( hellos[i].passivatedAndActivated() ) {
+ passivationCount++;
+ }
+ }
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ if( passivationCount != numHellos ) {
+ System.out.println("Passivation failed -- count = " + passivationCount + " instead of expected " + numHellos);
+ throw new EJBException("passivation failed");
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/descriptor/sun-ejb-jar.xml
index b73ef74..9be3449 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/descriptor/sun-ejb-jar.xml
@@ -24,7 +24,7 @@
<ejb-name>HelloBean</ejb-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>1</resize-quantity>
+ <resize-quantity>1</resize-quantity>
<cache-idle-timeout-in-seconds>4</cache-idle-timeout-in-seconds>
</bean-cache>
</ejb>
@@ -32,7 +32,7 @@
<ejb-name>StatefulNoIntf</ejb-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>1</resize-quantity>
+ <resize-quantity>1</resize-quantity>
<cache-idle-timeout-in-seconds>3</cache-idle-timeout-in-seconds>
</bean-cache>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
index b0df4ef..46b35b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
@@ -32,7 +32,7 @@
private boolean activated = false;
@EJB private SingletonNoIntf singletonNoIntf;
-
+
@EJB private SingletonMultiIntf singletonMultiIntf;
@EJB private Local1 local1;
@@ -50,50 +50,50 @@
@PostConstruct
public void init() {
- System.out.println("In HelloBean::init()");
+ System.out.println("In HelloBean::init()");
}
public String hello() {
- System.out.println("In HelloBean::hello()");
+ System.out.println("In HelloBean::hello()");
System.out.println("+++ sessionCtx type: " + sessionCtx.getClass());
- StatefulExpiration se = (StatefulExpiration) sessionCtx.lookup("java:module/StatefulExpiration");
- se.hello();
+ StatefulExpiration se = (StatefulExpiration) sessionCtx.lookup("java:module/StatefulExpiration");
+ se.hello();
- singletonNoIntf.hello();
- singletonMultiIntf.hello();
- local1.hello();
- local2.hello();
- remote1.hello();
- remote2.hello();
- statelessNoIntf.hello();
- statefulNoIntf.hello();
+ singletonNoIntf.hello();
+ singletonMultiIntf.hello();
+ local1.hello();
+ local2.hello();
+ remote1.hello();
+ remote2.hello();
+ statelessNoIntf.hello();
+ statefulNoIntf.hello();
- return "hello, world\n";
+ return "hello, world\n";
}
public boolean passivatedAndActivated() {
- return passivated && activated;
+ return passivated && activated;
}
@PrePassivate
public void prePass() {
- System.out.println("In HelloBean::prePass()");
- passivated = true;
+ System.out.println("In HelloBean::prePass()");
+ passivated = true;
}
@PostActivate
public void postAct() {
- System.out.println("In HelloBean::postAct()");
+ System.out.println("In HelloBean::postAct()");
hello();
- activated = true;
+ activated = true;
}
-
+
@PreDestroy
public void destroy() {
- System.out.println("In HelloBean::destroy()");
+ System.out.println("In HelloBean::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
index 42b78e3..d775a45 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
@@ -27,26 +27,26 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In NonSerializableInterceptor::init() ");
- i = 10;
- c.proceed();
+ System.out.println("In NonSerializableInterceptor::init() ");
+ i = 10;
+ c.proceed();
}
@AroundInvoke
- public Object doAI(InvocationContext c) throws Exception {
+ public Object doAI(InvocationContext c) throws Exception {
- System.out.println("In doAI , i = " + i);
- if( i != 10 ) {
- throw new EJBException("Wrong value of interceptor state = " +
- i);
- }
- return c.proceed();
+ System.out.println("In doAI , i = " + i);
+ if( i != 10 ) {
+ throw new EJBException("Wrong value of interceptor state = " +
+ i);
+ }
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In NonSerializableInterceptor::destroy() ");
- c.proceed();
+ System.out.println("In NonSerializableInterceptor::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java
index 42e9f94..1bf51a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java
@@ -31,18 +31,18 @@
@PostConstruct
public void init() {
- System.out.println("In SingletonMultiIntf::init()");
+ System.out.println("In SingletonMultiIntf::init()");
}
public String hello() {
- System.out.println("In SingletonMultiIntf::hello() invoked by " +
- sessionCtx.getInvokedBusinessInterface());
- return "hello, world\n";
+ System.out.println("In SingletonMultiIntf::hello() invoked by " +
+ sessionCtx.getInvokedBusinessInterface());
+ return "hello, world\n";
}
@PreDestroy
public void destroy() {
- System.out.println("In SingletonMultiIntf::destroy()");
+ System.out.println("In SingletonMultiIntf::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java
index 0d53adb..aa83e53 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java
@@ -25,17 +25,17 @@
@PostConstruct
public void init() {
- System.out.println("In SingletonNoIntf::init()");
+ System.out.println("In SingletonNoIntf::init()");
}
public String hello() {
- System.out.println("In SingletonNoIntf::hello()");
- return "hello, world\n";
+ System.out.println("In SingletonNoIntf::hello()");
+ return "hello, world\n";
}
@PreDestroy
public void destroy() {
- System.out.println("In SingletonNoIntf::destroy()");
+ System.out.println("In SingletonNoIntf::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java
index 7714e0b..1e41c9d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java
@@ -26,17 +26,17 @@
@PostConstruct
public void init() {
- System.out.println("In StatefulExpiration::init()");
+ System.out.println("In StatefulExpiration::init()");
}
public String hello() {
- System.out.println("In StatefulExpiration::hello()");
- return "hello, world\n";
+ System.out.println("In StatefulExpiration::hello()");
+ return "hello, world\n";
}
@PreDestroy
public void destroy() {
- System.out.println("In StatefulExpiration::destroy()");
+ System.out.println("In StatefulExpiration::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java
index 85a3874..93349a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java
@@ -27,22 +27,22 @@
@PostConstruct
public void init() {
- System.out.println("In StatefulNoIntf::init()");
+ System.out.println("In StatefulNoIntf::init()");
}
public String hello() {
- System.out.println("In StatefulNoIntf::hello()");
- return "hello, world\n";
+ System.out.println("In StatefulNoIntf::hello()");
+ return "hello, world\n";
}
@PreDestroy
public void destroy() {
- System.out.println("In StatefulNoIntf::destroy()");
+ System.out.println("In StatefulNoIntf::destroy()");
}
@PrePassivate
public void passivate() {
- System.out.println("In StatefulNoIntf::passivate()");
+ System.out.println("In StatefulNoIntf::passivate()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java
index c082754..608973b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java
@@ -25,17 +25,17 @@
@PostConstruct
public void init() {
- System.out.println("In StatelessNoIntf::init()");
+ System.out.println("In StatelessNoIntf::init()");
}
public String hello() {
- System.out.println("In StatelessNoIntf::hello()");
- return "hello, world\n";
+ System.out.println("In StatelessNoIntf::hello()");
+ return "hello, world\n";
}
@PreDestroy
public void destroy() {
- System.out.println("In StatelessNoIntf::destroy()");
+ System.out.println("In StatelessNoIntf::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.properties
index b26a531..032fa2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-remote1"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.xml
index 7cc3e0e..7e9215c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.xml
@@ -29,15 +29,15 @@
&commonBuild;
&testproperties;
- <!-- note that we don't undeploy as part of all target so
+ <!-- note that we don't undeploy as part of all target so
that top-level build script can run remote2 first -->
-
+
<target name="all" depends="build,deploy,run"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,12 +49,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Blah.class,**/Singleton*.class,**/Hello*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -62,9 +62,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java
index f61bbd2..3e51135 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java
@@ -31,17 +31,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -49,144 +49,144 @@
public void doTest() {
- try {
+ try {
- /**
- Object o= (HelloHome) new InitialContext().lookup("corbaname:iiop:localhost:3700#HH");
- HelloHome helloHomeCorbaName = (HelloHome)
- javax.rmi.PortableRemoteObject.narrow(o, HelloHome.class);
- callHome(helloHomeCorbaName);
- */
+ /**
+ Object o= (HelloHome) new InitialContext().lookup("corbaname:iiop:localhost:3700#HH");
+ HelloHome helloHomeCorbaName = (HelloHome)
+ javax.rmi.PortableRemoteObject.narrow(o, HelloHome.class);
+ callHome(helloHomeCorbaName);
+ */
- HelloHome helloHome = (HelloHome) new InitialContext().lookup("java:global/" + appName + "/HelloBean!com.acme.HelloHome");
- callHome(helloHome);
+ HelloHome helloHome = (HelloHome) new InitialContext().lookup("java:global/" + appName + "/HelloBean!com.acme.HelloHome");
+ callHome(helloHome);
- Hello hello = (Hello) new InitialContext().lookup("HH#com.acme.Hello");
+ Hello hello = (Hello) new InitialContext().lookup("HH#com.acme.Hello");
- // @@@ TODO System.out.println("Lookup via app-defined global name");
- // @@@ Not implemented yet @@@ Hello hellog = (Hello) new InitialContext().lookup("java:global/HBGlobal");
+ // @@@ TODO System.out.println("Lookup via app-defined global name");
+ // @@@ Not implemented yet @@@ Hello hellog = (Hello) new InitialContext().lookup("java:global/HBGlobal");
- Future<String> future = hello.helloAsync();
-
- // "memory leak" don't call get on async that returns a future
- // At the least should be cleaned up at container shutdown but
- // but possibly sooner
- hello.helloAsync();
- hello.helloAsync();
- hello.helloAsync();
+ Future<String> future = hello.helloAsync();
- hello.fireAndForget();
-
- try {
- String result = future.get();
- System.out.println("helloAsync() says : " + result);
- } catch(ExecutionException e) {
- System.out.println("Got async ExecutionException. Cause is " +
- e.getCause().getMessage());
- e.getCause().printStackTrace();
- }
+ // "memory leak" don't call get on async that returns a future
+ // At the least should be cleaned up at container shutdown but
+ // but possibly sooner
+ hello.helloAsync();
+ hello.helloAsync();
+ hello.helloAsync();
- Future<String> futureTO = hello.asyncBlock(5);
- // Test timeout
- try {
+ hello.fireAndForget();
- String result = futureTO.get(1, TimeUnit.MILLISECONDS);
- throw new EJBException("Should have timed out");
- } catch(TimeoutException toe) {
- try {
- String result = futureTO.get();
- System.out.println("asyncBlock() says : " + result);
- } catch(Exception e) {
- throw new EJBException(e);
- }
- } catch(ExecutionException e) {
- System.out.println("Got async ExecutionException. Cause is " +
- e.getCause().getMessage());
- e.getCause().printStackTrace();
- }
-
- Future<String> futureException =
- hello.asyncThrowException("jakarta.ejb.ConcurrentAccessTimeoutException");
- try {
- String result = futureException.get();
- throw new EJBException("Should have gotten exception");
- } catch(ExecutionException e) {
- if( e.getCause() instanceof jakarta.ejb.ConcurrentAccessTimeoutException) {
- System.out.println("Got correct async exception. Cause is " +
- e.getCause().getMessage());
- } else {
- throw new EJBException("wrong exception", e);
- }
- }
+ try {
+ String result = future.get();
+ System.out.println("helloAsync() says : " + result);
+ } catch(ExecutionException e) {
+ System.out.println("Got async ExecutionException. Cause is " +
+ e.getCause().getMessage());
+ e.getCause().printStackTrace();
+ }
- Future<String> futureCancel = null;
- try {
- futureCancel = hello.asyncCancel(5);
- futureCancel.cancel(true);
- futureCancel.get();
- throw new EJBException("Should have gotten exception");
- } catch(ExecutionException e) {
- if( e.getCause().getClass().getName().equals("java.lang.Exception")) {
- System.out.println("Got correct async exception. Cause is " +
- e.getCause().getMessage());
- } else {
- throw new EJBException("wrong exception", e);
- }
- }
+ Future<String> futureTO = hello.asyncBlock(5);
+ // Test timeout
+ try {
- try {
- hello.throwException("jakarta.ejb.ConcurrentAccessException");
- throw new EJBException("expected an exception");
- } catch(ConcurrentAccessException cae) {
- System.out.println("Got expected " + cae);
- }
+ String result = futureTO.get(1, TimeUnit.MILLISECONDS);
+ throw new EJBException("Should have timed out");
+ } catch(TimeoutException toe) {
+ try {
+ String result = futureTO.get();
+ System.out.println("asyncBlock() says : " + result);
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
+ } catch(ExecutionException e) {
+ System.out.println("Got async ExecutionException. Cause is " +
+ e.getCause().getMessage());
+ e.getCause().printStackTrace();
+ }
- try {
- hello.throwException("jakarta.ejb.ConcurrentAccessTimeoutException");
- throw new EJBException("expected an exception");
- } catch(ConcurrentAccessTimeoutException cat) {
- System.out.println("Got expected " + cat);
- }
+ Future<String> futureException =
+ hello.asyncThrowException("jakarta.ejb.ConcurrentAccessTimeoutException");
+ try {
+ String result = futureException.get();
+ throw new EJBException("Should have gotten exception");
+ } catch(ExecutionException e) {
+ if( e.getCause() instanceof jakarta.ejb.ConcurrentAccessTimeoutException) {
+ System.out.println("Got correct async exception. Cause is " +
+ e.getCause().getMessage());
+ } else {
+ throw new EJBException("wrong exception", e);
+ }
+ }
- try {
- hello.throwException("jakarta.ejb.IllegalLoopbackException");
- throw new EJBException("expected an exception");
- } catch(IllegalLoopbackException ile) {
- System.out.println("Got expected " + ile);
- }
+ Future<String> futureCancel = null;
+ try {
+ futureCancel = hello.asyncCancel(5);
+ futureCancel.cancel(true);
+ futureCancel.get();
+ throw new EJBException("Should have gotten exception");
+ } catch(ExecutionException e) {
+ if( e.getCause().getClass().getName().equals("java.lang.Exception")) {
+ System.out.println("Got correct async exception. Cause is " +
+ e.getCause().getMessage());
+ } else {
+ throw new EJBException("wrong exception", e);
+ }
+ }
+
+ try {
+ hello.throwException("jakarta.ejb.ConcurrentAccessException");
+ throw new EJBException("expected an exception");
+ } catch(ConcurrentAccessException cae) {
+ System.out.println("Got expected " + cae);
+ }
+
+ try {
+ hello.throwException("jakarta.ejb.ConcurrentAccessTimeoutException");
+ throw new EJBException("expected an exception");
+ } catch(ConcurrentAccessTimeoutException cat) {
+ System.out.println("Got expected " + cat);
+ }
+
+ try {
+ hello.throwException("jakarta.ejb.IllegalLoopbackException");
+ throw new EJBException("expected an exception");
+ } catch(IllegalLoopbackException ile) {
+ System.out.println("Got expected " + ile);
+ }
- // Fully-qualified portable global
- HelloHome helloHome2 = (HelloHome) new InitialContext().lookup("java:global/" + appName + "/HelloBean!com.acme.HelloHome");
- callHome(helloHome2);
+ // Fully-qualified portable global
+ HelloHome helloHome2 = (HelloHome) new InitialContext().lookup("java:global/" + appName + "/HelloBean!com.acme.HelloHome");
+ callHome(helloHome2);
- Hello hello2 = (Hello) new InitialContext().lookup("java:global/" + appName + "/HelloBean!com.acme.Hello");
- callBusHome(hello2);
+ Hello hello2 = (Hello) new InitialContext().lookup("java:global/" + appName + "/HelloBean!com.acme.Hello");
+ callBusHome(hello2);
- // non-portable global
- HelloHome helloHome5 = (HelloHome) new InitialContext().lookup("HH");
- callHome(helloHome5);
+ // non-portable global
+ HelloHome helloHome5 = (HelloHome) new InitialContext().lookup("HH");
+ callHome(helloHome5);
- Hello hello5 = (Hello) new InitialContext().lookup("HH#com.acme.Hello");
- callBusHome(hello5);
+ Hello hello5 = (Hello) new InitialContext().lookup("HH#com.acme.Hello");
+ callBusHome(hello5);
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
private static void callHome(HelloHome home) throws Exception {
- // HelloHome home = (HelloHome) PortableRemoteObject.narrow(obj, HelloHome.class);
- HelloRemote hr = home.create();
- System.out.println("2.x HelloRemote.hello() says " + hr.hello());
+ // HelloHome home = (HelloHome) PortableRemoteObject.narrow(obj, HelloHome.class);
+ HelloRemote hr = home.create();
+ System.out.println("2.x HelloRemote.hello() says " + hr.hello());
}
private static void callBusHome(Hello h) {
- System.out.println("Hello.hello() says " + h.hello());
+ System.out.println("Hello.hello() says " + h.hello());
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client2.java
index 9bb87ef..830ce33 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client2.java
@@ -23,29 +23,29 @@
public static void main(String args[]) {
- String host;
- String port;
+ String host;
+ String port;
- try {
- Properties p = new Properties();
- if( args.length > 0 ) {
- host = args[0];
- p.put("org.omg.CORBA.ORBInitialHost", host);
- }
+ try {
+ Properties p = new Properties();
+ if( args.length > 0 ) {
+ host = args[0];
+ p.put("org.omg.CORBA.ORBInitialHost", host);
+ }
- if( args.length > 1 ) {
- port = args[1];
- p.put("org.omg.CORBA.ORBInitialPort", port);
- }
+ if( args.length > 1 ) {
+ port = args[1];
+ p.put("org.omg.CORBA.ORBInitialPort", port);
+ }
- InitialContext ic = new InitialContext(p);
- Hello h = (Hello) ic.lookup("HH#com.acme.Hello");
- h.hello();
+ InitialContext ic = new InitialContext(p);
+ Hello h = (Hello) ic.lookup("HH#com.acme.Hello");
+ h.hello();
- } catch(Exception e) {
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java
index 80eaa31..3ede06e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java
@@ -30,10 +30,10 @@
// marked async on bean class
void fireAndForget();
-
+
Future<String> asyncThrowException(String exceptionType);
Future<String> asyncCancel(int seconds) throws Exception;
-
+
void throwException(String exceptionType);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java
index eec3523..b31d6e1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java
@@ -51,83 +51,83 @@
@PostConstruct
public void init() {
- System.out.println("In HelloBean::init()");
+ System.out.println("In HelloBean::init()");
}
public String hello() {
- System.out.println("In HelloBean::hello()");
- return "hello, world\n";
+ System.out.println("In HelloBean::hello()");
+ return "hello, world\n";
}
@Asynchronous
public Future<String> helloAsync() {
- System.out.println("In HelloBean::helloAsync()");
- return new AsyncResult<String>("helo, async world!\n");
+ System.out.println("In HelloBean::helloAsync()");
+ return new AsyncResult<String>("helo, async world!\n");
}
@Asynchronous
public Future<String> asyncBlock(int seconds) {
- System.out.println("In HelloBean::asyncBlock");
- sleep(seconds);
- return new AsyncResult<String>("blocked successfully");
+ System.out.println("In HelloBean::asyncBlock");
+ sleep(seconds);
+ return new AsyncResult<String>("blocked successfully");
}
- @Asynchronous
+ @Asynchronous
public void fireAndForget() {
- System.out.println("In HelloBean::fireAndForget()");
- sleep(5);
+ System.out.println("In HelloBean::fireAndForget()");
+ sleep(5);
}
-
+
@Asynchronous
public Future<String> asyncThrowException(String exceptionType) {
- System.out.println("In HelloBean::asyncThrowException");
- throwException(exceptionType);
- return new AsyncResult<String>("should have thrown exception");
+ System.out.println("In HelloBean::asyncThrowException");
+ throwException(exceptionType);
+ return new AsyncResult<String>("should have thrown exception");
}
@Asynchronous
public Future<String> asyncCancel(int seconds) throws Exception
{
- System.out.println("In HelloBean::asyncCancel");
- sleep(seconds);
- if( sessionCtx.wasCancelCalled() ) {
- throw new Exception("Canceled after " + seconds + " seconds");
- }
- return new AsyncResult<String>("asyncCancel() should have been cancelled");
+ System.out.println("In HelloBean::asyncCancel");
+ sleep(seconds);
+ if( sessionCtx.wasCancelCalled() ) {
+ throw new Exception("Canceled after " + seconds + " seconds");
+ }
+ return new AsyncResult<String>("asyncCancel() should have been cancelled");
}
public void throwException(String exceptionType) {
- if( exceptionType.equals("jakarta.ejb.EJBException") ) {
- throw new EJBException(exceptionType);
- } else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessException") ) {
- throw new ConcurrentAccessException(exceptionType);
- } else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessTimeoutException") ) {
- throw new ConcurrentAccessTimeoutException(exceptionType);
- } else if( exceptionType.equals("jakarta.ejb.IllegalLoopbackException") ) {
- throw new IllegalLoopbackException(exceptionType);
- }
+ if( exceptionType.equals("jakarta.ejb.EJBException") ) {
+ throw new EJBException(exceptionType);
+ } else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessException") ) {
+ throw new ConcurrentAccessException(exceptionType);
+ } else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessTimeoutException") ) {
+ throw new ConcurrentAccessTimeoutException(exceptionType);
+ } else if( exceptionType.equals("jakarta.ejb.IllegalLoopbackException") ) {
+ throw new IllegalLoopbackException(exceptionType);
+ }
- throw new IllegalArgumentException(exceptionType);
+ throw new IllegalArgumentException(exceptionType);
}
private void sleep(int seconds) {
- System.out.println("In HelloBean::sleeping for " + seconds +
- "seconds");
- try {
- Thread.currentThread().sleep(seconds * 1000);
- System.out.println("In HelloBean::woke up from " + seconds +
- "second sleep");
- } catch(Exception e) {
- e.printStackTrace();
- }
+ System.out.println("In HelloBean::sleeping for " + seconds +
+ "seconds");
+ try {
+ Thread.currentThread().sleep(seconds * 1000);
+ System.out.println("In HelloBean::woke up from " + seconds +
+ "second sleep");
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
@PreDestroy
public void destroy() {
- System.out.println("In HelloBean::destroy()");
+ System.out.println("In HelloBean::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java
index 37b1265..c678bdc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java
@@ -32,56 +32,56 @@
public void init() {
System.out.println("In SingletonBean::init()");
- try {
- HelloRemote hr = helloHome.create();
- System.out.println("HellohelloRemote.hello() says " + hr.hello());
+ try {
+ HelloRemote hr = helloHome.create();
+ System.out.println("HellohelloRemote.hello() says " + hr.hello());
- System.out.println("Hello.hello() says " + hello.hello());
+ System.out.println("Hello.hello() says " + hello.hello());
- InitialContext ic = new InitialContext();
+ InitialContext ic = new InitialContext();
- SessionContext ctx = (SessionContext)
- ic.lookup("java:module/env/sesCtx");
+ SessionContext ctx = (SessionContext)
+ ic.lookup("java:module/env/sesCtx");
- SingletonBean me = (SingletonBean)
- ic.lookup("java:app/ejb-ejb31-full-remote1-ejb/SingletonBean");
-
- SingletonBean meToo = (SingletonBean)
- ic.lookup("java:app/ejb-ejb31-full-remote1-ejb/SingletonBean!com.acme.SingletonBean");
+ SingletonBean me = (SingletonBean)
+ ic.lookup("java:app/ejb-ejb31-full-remote1-ejb/SingletonBean");
- Hello m1 = (Hello) ic.lookup("java:module/env/M1");
+ SingletonBean meToo = (SingletonBean)
+ ic.lookup("java:app/ejb-ejb31-full-remote1-ejb/SingletonBean!com.acme.SingletonBean");
- HelloHome m2 = (HelloHome) ctx.lookup("java:module/M2");
+ Hello m1 = (Hello) ic.lookup("java:module/env/M1");
- Hello a1 = (Hello) ctx.lookup("java:app/env/A1");
+ HelloHome m2 = (HelloHome) ctx.lookup("java:module/M2");
- HelloHome a2 = (HelloHome) ic.lookup("java:app/A2");
+ Hello a1 = (Hello) ctx.lookup("java:app/env/A1");
- try {
- ic.lookup("java:comp/env/C1");
- throw new EJBException("Expected exception accessing private component environment entry of HelloBean");
- } catch(NamingException e) {
- System.out.println("Successfully did *not* find HelloBean private component environment dependency");
- }
+ HelloHome a2 = (HelloHome) ic.lookup("java:app/A2");
- try {
- ic.lookup("java:comp/C1");
- throw new EJBException("Expected exception accessing private component environment entry of HelloBean");
- } catch(NamingException e) {
- System.out.println("Successfully did *not* find HelloBean private component environment dependency");
- }
+ try {
+ ic.lookup("java:comp/env/C1");
+ throw new EJBException("Expected exception accessing private component environment entry of HelloBean");
+ } catch(NamingException e) {
+ System.out.println("Successfully did *not* find HelloBean private component environment dependency");
+ }
- System.out.println("My AppName = " +
- ctx.lookup("java:app/AppName"));
+ try {
+ ic.lookup("java:comp/C1");
+ throw new EJBException("Expected exception accessing private component environment entry of HelloBean");
+ } catch(NamingException e) {
+ System.out.println("Successfully did *not* find HelloBean private component environment dependency");
+ }
- System.out.println("My ModuleName = " +
- ctx.lookup("java:module/ModuleName"));
+ System.out.println("My AppName = " +
+ ctx.lookup("java:app/AppName"));
-
+ System.out.println("My ModuleName = " +
+ ctx.lookup("java:module/ModuleName"));
- } catch(Exception e) {
- throw new EJBException("singleton init error" , e);
- }
+
+
+ } catch(Exception e) {
+ throw new EJBException("singleton init error" , e);
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.properties
index 8c97a72..1f8f5c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-remote2"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.xml
index 2dfbaa8..e21fda8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -73,7 +73,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java
index 9cad009..4f67b60 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java
@@ -26,42 +26,42 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest(args[1]);
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest(args[1]);
stat.printSummary(appName + "ID");
}
- public Client(String[] args) {
+ public Client(String[] args) {
}
public void doTest(String otherApp) {
- try {
+ try {
- Hello hGlobal = (Hello) new InitialContext().lookup("java:global/HBGlobal");
- System.out.println("hGlobal = " + hGlobal);
- System.out.println("hGlobal hello = " + hGlobal.hello());
+ Hello hGlobal = (Hello) new InitialContext().lookup("java:global/HBGlobal");
+ System.out.println("hGlobal = " + hGlobal);
+ System.out.println("hGlobal hello = " + hGlobal.hello());
- SingletonRemote singleton = (SingletonRemote) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+ SingletonRemote singleton = (SingletonRemote) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
- // pass name of remotestateless app
- singleton.doTest(otherApp);
+ // pass name of remotestateless app
+ singleton.doTest(otherApp);
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java
index 80eaa31..3ede06e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java
@@ -30,10 +30,10 @@
// marked async on bean class
void fireAndForget();
-
+
Future<String> asyncThrowException(String exceptionType);
Future<String> asyncCancel(int seconds) throws Exception;
-
+
void throwException(String exceptionType);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java
index 06ac43e..f29b0df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java
@@ -36,7 +36,7 @@
@EJB(name="hellohomeref", mappedName="HH") HelloHome helloHome;
@EJB(name="helloref2", lookup="HH#com.acme.Hello") Hello hello2;
- @EJB(name="hellohomeref2", lookup="HH") HelloHome helloHome2;
+ @EJB(name="hellohomeref2", lookup="HH") HelloHome helloHome2;
@EJB RemoteAsync statefulBean;
@@ -50,192 +50,192 @@
public void doTest(String targetAppName) {
- try {
+ try {
- Hello hGlobal = (Hello) new InitialContext().lookup("java:global/HBGlobal");
- System.out.println("hGlobal = " + hGlobal);
- System.out.println("hGlobal hello = " + hGlobal.hello());
+ Hello hGlobal = (Hello) new InitialContext().lookup("java:global/HBGlobal");
+ System.out.println("hGlobal = " + hGlobal);
+ System.out.println("hGlobal hello = " + hGlobal.hello());
- Future<String> futureSful = statefulBean.helloAsync();
- System.out.println("Stateful bean says " + futureSful.get());
+ Future<String> futureSful = statefulBean.helloAsync();
+ System.out.println("Stateful bean says " + futureSful.get());
- futureSful = statefulBean.removeAfterCalling();
- System.out.println("Stateful bean removed status = " + futureSful.get());
+ futureSful = statefulBean.removeAfterCalling();
+ System.out.println("Stateful bean removed status = " + futureSful.get());
- boolean gotSfulException = false;
- try {
- futureSful = statefulBean.helloAsync();
- } catch(NoSuchEJBException nsee) {
- System.out.println("Got nsee from helloAsync");
- gotSfulException = true;
- }
+ boolean gotSfulException = false;
+ try {
+ futureSful = statefulBean.helloAsync();
+ } catch(NoSuchEJBException nsee) {
+ System.out.println("Got nsee from helloAsync");
+ gotSfulException = true;
+ }
- try {
- if( !gotSfulException ) {
- System.out.println("return value = " + futureSful.get());
- throw new EJBException("Should have gotten exception");
- }
- } catch(ExecutionException ee) {
- if( ee.getCause() instanceof NoSuchEJBException ) {
- System.out.println("Successfully caught NoSuchEJBException when " +
- "accessing sful bean asynchronously after removal");
- } else {
- throw new EJBException("wrong exception during sfsb access after removal",
- ee);
- }
- }
+ try {
+ if( !gotSfulException ) {
+ System.out.println("return value = " + futureSful.get());
+ throw new EJBException("Should have gotten exception");
+ }
+ } catch(ExecutionException ee) {
+ if( ee.getCause() instanceof NoSuchEJBException ) {
+ System.out.println("Successfully caught NoSuchEJBException when " +
+ "accessing sful bean asynchronously after removal");
+ } else {
+ throw new EJBException("wrong exception during sfsb access after removal",
+ ee);
+ }
+ }
- String targetAppJndiPrefix = "java:global/" + targetAppName + "/";
+ String targetAppJndiPrefix = "java:global/" + targetAppName + "/";
- HelloHome helloHomePGlobal = (HelloHome) new InitialContext().lookup(targetAppJndiPrefix + "HelloBean!com.acme.HelloHome");
+ HelloHome helloHomePGlobal = (HelloHome) new InitialContext().lookup(targetAppJndiPrefix + "HelloBean!com.acme.HelloHome");
- ORB orb = (ORB) sesCtx.lookup("java:comp/ORB");
- System.out.println("orb = " + orb);
- ORB orb2 = (ORB) new InitialContext().lookup("java:comp/ORB");
- System.out.println("orb2 = " + orb2);
+ ORB orb = (ORB) sesCtx.lookup("java:comp/ORB");
+ System.out.println("orb = " + orb);
+ ORB orb2 = (ORB) new InitialContext().lookup("java:comp/ORB");
+ System.out.println("orb2 = " + orb2);
- Future<String> future = hello.helloAsync();
-
- // "memory leak" don't call get on async that returns a future
- // At the least should be cleaned up at container shutdown but
- // but possibly sooner
- hello.helloAsync();
- hello.helloAsync();
- hello.helloAsync();
+ Future<String> future = hello.helloAsync();
+
+ // "memory leak" don't call get on async that returns a future
+ // At the least should be cleaned up at container shutdown but
+ // but possibly sooner
+ hello.helloAsync();
+ hello.helloAsync();
+ hello.helloAsync();
- hello.fireAndForget();
-
- try {
- String result = future.get();
- System.out.println("helloAsync() says : " + result);
- } catch(ExecutionException e) {
- System.out.println("Got async ExecutionException. Cause is " +
- e.getCause().getMessage());
- e.getCause().printStackTrace();
- }
+ hello.fireAndForget();
- Future<String> futureTO = hello.asyncBlock(5);
- // Test timeout
- try {
+ try {
+ String result = future.get();
+ System.out.println("helloAsync() says : " + result);
+ } catch(ExecutionException e) {
+ System.out.println("Got async ExecutionException. Cause is " +
+ e.getCause().getMessage());
+ e.getCause().printStackTrace();
+ }
- String result = futureTO.get(1, TimeUnit.MILLISECONDS);
- throw new EJBException("Should have timed out");
- } catch(TimeoutException toe) {
- try {
- String result = futureTO.get();
- System.out.println("asyncBlock() says : " + result);
- } catch(Exception e) {
- throw new EJBException(e);
- }
- } catch(ExecutionException e) {
- System.out.println("Got async ExecutionException. Cause is " +
- e.getCause().getMessage());
- e.getCause().printStackTrace();
- }
-
- Future<String> futureException =
- hello.asyncThrowException("jakarta.ejb.ConcurrentAccessTimeoutException");
- try {
- String result = futureException.get();
- throw new EJBException("Should have gotten exception");
- } catch(ExecutionException e) {
- if( e.getCause() instanceof jakarta.ejb.ConcurrentAccessTimeoutException) {
- System.out.println("Got correct async exception. Cause is " +
- e.getCause().getMessage());
- } else {
- throw new EJBException("wrong exception", e);
- }
- }
+ Future<String> futureTO = hello.asyncBlock(5);
+ // Test timeout
+ try {
- Future<String> futureCancel = null;
- try {
- futureCancel = hello.asyncCancel(5);
- futureCancel.cancel(true);
- futureCancel.get();
- throw new EJBException("Should have gotten exception");
- } catch(ExecutionException e) {
- if( e.getCause().getClass().getName().equals("java.lang.Exception")) {
- System.out.println("Got correct async exception. Cause is " +
- e.getCause().getMessage());
- } else {
- throw new EJBException("wrong exception", e);
- }
- }
+ String result = futureTO.get(1, TimeUnit.MILLISECONDS);
+ throw new EJBException("Should have timed out");
+ } catch(TimeoutException toe) {
+ try {
+ String result = futureTO.get();
+ System.out.println("asyncBlock() says : " + result);
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
+ } catch(ExecutionException e) {
+ System.out.println("Got async ExecutionException. Cause is " +
+ e.getCause().getMessage());
+ e.getCause().printStackTrace();
+ }
- // injected
- callHome(helloHome);
- callBusHome(hello);
+ Future<String> futureException =
+ hello.asyncThrowException("jakarta.ejb.ConcurrentAccessTimeoutException");
+ try {
+ String result = futureException.get();
+ throw new EJBException("Should have gotten exception");
+ } catch(ExecutionException e) {
+ if( e.getCause() instanceof jakarta.ejb.ConcurrentAccessTimeoutException) {
+ System.out.println("Got correct async exception. Cause is " +
+ e.getCause().getMessage());
+ } else {
+ throw new EJBException("wrong exception", e);
+ }
+ }
+
+ Future<String> futureCancel = null;
+ try {
+ futureCancel = hello.asyncCancel(5);
+ futureCancel.cancel(true);
+ futureCancel.get();
+ throw new EJBException("Should have gotten exception");
+ } catch(ExecutionException e) {
+ if( e.getCause().getClass().getName().equals("java.lang.Exception")) {
+ System.out.println("Got correct async exception. Cause is " +
+ e.getCause().getMessage());
+ } else {
+ throw new EJBException("wrong exception", e);
+ }
+ }
+
+ // injected
+ callHome(helloHome);
+ callBusHome(hello);
- try {
- hello.throwException("jakarta.ejb.ConcurrentAccessException");
- throw new EJBException("expected an exception");
- } catch(ConcurrentAccessException cae) {
- System.out.println("Got expected " + cae);
- }
+ try {
+ hello.throwException("jakarta.ejb.ConcurrentAccessException");
+ throw new EJBException("expected an exception");
+ } catch(ConcurrentAccessException cae) {
+ System.out.println("Got expected " + cae);
+ }
- try {
- hello.throwException("jakarta.ejb.ConcurrentAccessTimeoutException");
- throw new EJBException("expected an exception");
- } catch(ConcurrentAccessTimeoutException cat) {
- System.out.println("Got expected " + cat);
- }
+ try {
+ hello.throwException("jakarta.ejb.ConcurrentAccessTimeoutException");
+ throw new EJBException("expected an exception");
+ } catch(ConcurrentAccessTimeoutException cat) {
+ System.out.println("Got expected " + cat);
+ }
- try {
- hello.throwException("jakarta.ejb.IllegalLoopbackException");
- throw new EJBException("expected an exception");
- } catch(IllegalLoopbackException ile) {
- System.out.println("Got expected " + ile);
- }
+ try {
+ hello.throwException("jakarta.ejb.IllegalLoopbackException");
+ throw new EJBException("expected an exception");
+ } catch(IllegalLoopbackException ile) {
+ System.out.println("Got expected " + ile);
+ }
- // Fully-qualified portable global
- HelloHome helloHome2 = (HelloHome) new InitialContext().lookup(targetAppJndiPrefix + "HelloBean!com.acme.HelloHome");
- callHome(helloHome2);
+ // Fully-qualified portable global
+ HelloHome helloHome2 = (HelloHome) new InitialContext().lookup(targetAppJndiPrefix + "HelloBean!com.acme.HelloHome");
+ callHome(helloHome2);
- Hello hello2 = (Hello) new InitialContext().lookup(targetAppJndiPrefix + "HelloBean!com.acme.Hello");
- callBusHome(hello2);
+ Hello hello2 = (Hello) new InitialContext().lookup(targetAppJndiPrefix + "HelloBean!com.acme.Hello");
+ callBusHome(hello2);
- // Fully-qualified portable global via sesion context
- HelloHome helloHome3 = (HelloHome) sesCtx.lookup(targetAppJndiPrefix + "HelloBean!com.acme.HelloHome");
- callHome(helloHome3);
+ // Fully-qualified portable global via sesion context
+ HelloHome helloHome3 = (HelloHome) sesCtx.lookup(targetAppJndiPrefix + "HelloBean!com.acme.HelloHome");
+ callHome(helloHome3);
- Hello hello3 = (Hello) sesCtx.lookup(targetAppJndiPrefix + "HelloBean!com.acme.Hello");
- callBusHome(hello3);
+ Hello hello3 = (Hello) sesCtx.lookup(targetAppJndiPrefix + "HelloBean!com.acme.Hello");
+ callBusHome(hello3);
- // ejb-ref
- HelloHome helloHome4 = (HelloHome) sesCtx.lookup("java:comp/env/hellohomeref");
- callHome(helloHome4);
+ // ejb-ref
+ HelloHome helloHome4 = (HelloHome) sesCtx.lookup("java:comp/env/hellohomeref");
+ callHome(helloHome4);
- Hello hello4 = (Hello) sesCtx.lookup("java:comp/env/helloref");
- callBusHome(hello4);
-
- // non-portable global
- HelloHome helloHome5 = (HelloHome) new InitialContext().lookup("HH");
- callHome(helloHome5);
+ Hello hello4 = (Hello) sesCtx.lookup("java:comp/env/helloref");
+ callBusHome(hello4);
- Hello hello5 = (Hello) new InitialContext().lookup("HH#com.acme.Hello");
- callBusHome(hello5);
+ // non-portable global
+ HelloHome helloHome5 = (HelloHome) new InitialContext().lookup("HH");
+ callHome(helloHome5);
+
+ Hello hello5 = (Hello) new InitialContext().lookup("HH#com.acme.Hello");
+ callBusHome(hello5);
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException("test failed", e);
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException("test failed", e);
+ }
}
private void callHome(HelloHome home) throws Exception {
- // HelloHome home = (HelloHome) PortableRemoteObject.narrow(obj, HelloHome.class);
- HelloRemote hr = home.create();
- System.out.println("2.x HelloRemote.hello() says " + hr.hello());
+ // HelloHome home = (HelloHome) PortableRemoteObject.narrow(obj, HelloHome.class);
+ HelloRemote hr = home.create();
+ System.out.println("2.x HelloRemote.hello() says " + hr.hello());
}
private void callBusHome(Hello h) {
- System.out.println("Hello.hello() says " + h.hello());
+ System.out.println("Hello.hello() says " + h.hello());
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java
index 0474062..98e5fbe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java
@@ -35,14 +35,14 @@
@Asynchronous
public Future<String> helloAsync() {
- return new AsyncResult<String>("hello, world\n");
+ return new AsyncResult<String>("hello, world\n");
}
@Asynchronous
@Remove
public Future<String> removeAfterCalling() {
- System.out.println("In StatefulBean::removeAfterCalling()");
- return new AsyncResult<String>("removed");
+ System.out.println("In StatefulBean::removeAfterCalling()");
+ return new AsyncResult<String>("removed");
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.properties
index 792a9d5..f57c774 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-schema"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="ejbmodulename"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="ejbmodulename"/> \u0020
+<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/> \u0020
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.xml
index 5df09cf..3605d50 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -74,7 +74,7 @@
<antcall target="undeploy-common">
<param name="deployedapp.name" value="ejbmodulename"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java
index 0028952..17226d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java
@@ -26,53 +26,53 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
- public Client(String[] args) {
+ public Client(String[] args) {
}
public void doTest() {
- try {
+ try {
- RemoteSingleton singleton = (RemoteSingleton) new InitialContext().lookup("java:global/" + appName + "/SingletonBean!com.acme.RemoteSingleton");
+ RemoteSingleton singleton = (RemoteSingleton) new InitialContext().lookup("java:global/" + appName + "/SingletonBean!com.acme.RemoteSingleton");
- // Also make sure we can look it up via the product-specific
- // global JNDI name specified via ejb-jar.xml
- RemoteSingleton singleton2 = (RemoteSingleton) new InitialContext().lookup("ejb_ejb31_full_schema_SingletonRemote");
+ // Also make sure we can look it up via the product-specific
+ // global JNDI name specified via ejb-jar.xml
+ RemoteSingleton singleton2 = (RemoteSingleton) new InitialContext().lookup("ejb_ejb31_full_schema_SingletonRemote");
- int sleepSeconds = 10;
- System.out.println("Sleeping for " + sleepSeconds + " seconds before checking " +
- "results...");
- // wait a few seconds for timeout to happen
- Thread.sleep(sleepSeconds * 1000);
+ int sleepSeconds = 10;
+ System.out.println("Sleeping for " + sleepSeconds + " seconds before checking " +
+ "results...");
+ // wait a few seconds for timeout to happen
+ Thread.sleep(sleepSeconds * 1000);
- System.out.println("Woke up");
+ System.out.println("Woke up");
- boolean testResult = singleton.getTestResult();
+ boolean testResult = singleton.getTestResult();
- if( !testResult ) {
- throw new EJBException("testResult = false");
- }
+ if( !testResult ) {
+ throw new EJBException("testResult = false");
+ }
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml
index 94b0383..0ad2120 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml
@@ -24,10 +24,10 @@
<enterprise-beans>
<session>
<ejb-name>SingletonBean</ejb-name>
- <local-bean/>
- <ejb-class>com.acme.SingletonBean</ejb-class>
- <session-type>Singleton</session-type>
- <timer>
+ <local-bean/>
+ <ejb-class>com.acme.SingletonBean</ejb-class>
+ <session-type>Singleton</session-type>
+ <timer>
<description>Sample timer</description>
<schedule>
<second>1</second>
@@ -36,132 +36,132 @@
<day-of-month>Last Tue</day-of-month>
<month>Feb</month>
<year>2010</year>
- </schedule>
+ </schedule>
<start>2002-10-10T12:00:00</start>
<end>2002-10-10T12:00:00</end>
<timeout-method>
<method-name>mytimeout2</method-name>
- </timeout-method>
+ </timeout-method>
<persistent>false</persistent>
<timezone>America/New_York</timezone>
<info>some info</info>
- </timer>
- <timer>
+ </timer>
+ <timer>
<description>Sample timer1</description>
<schedule>
<second>*/2</second>
<minute>*</minute>
<hour>*</hour>
- </schedule>
+ </schedule>
<timeout-method>
<method-name>mytimeout1</method-name>
- </timeout-method>
+ </timeout-method>
<persistent>false</persistent>
<timezone>America/New_York</timezone>
<info>some info</info>
- </timer>
- <timer>
+ </timer>
+ <timer>
<description>Sample timer2</description>
<schedule>
<second>*/7</second>
<minute>*</minute>
<hour>*</hour>
<day-of-month>*</day-of-month>
- </schedule>
+ </schedule>
<timeout-method>
<method-name>mytimeout</method-name>
- <method-params>
- <method-param>jakarta.ejb.Timer</method-param>
- </method-params>
- </timeout-method>
+ <method-params>
+ <method-param>jakarta.ejb.Timer</method-param>
+ </method-params>
+ </timeout-method>
<persistent>true</persistent>
<info>info</info>
- </timer>
- <init-on-startup>true</init-on-startup>
- <concurrency-management-type>Bean</concurrency-management-type>
- <concurrent-method>
- <method>
+ </timer>
+ <init-on-startup>true</init-on-startup>
+ <concurrency-management-type>Bean</concurrency-management-type>
+ <concurrent-method>
+ <method>
<method-name>foo</method-name>
- </method>
+ </method>
<lock>Write</lock>
<access-timeout>
- <timeout>19876</timeout>
- <unit>Seconds</unit>
- </access-timeout>
- </concurrent-method>
- <depends-on>
+ <timeout>19876</timeout>
+ <unit>Seconds</unit>
+ </access-timeout>
+ </concurrent-method>
+ <depends-on>
<ejb-name>SingletonBean2</ejb-name>
- </depends-on>
- <async-method>
- <method-name>foo</method-name>
- </async-method>
+ </depends-on>
+ <async-method>
+ <method-name>foo</method-name>
+ </async-method>
<ejb-ref>
<ejb-ref-name>ejb/lookup1</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<remote>com.acme.RemoteSingleton</remote>
- <lookup-name>java:module/SingletonBean!com.acme.RemoteSingleton</lookup-name>
+ <lookup-name>java:module/SingletonBean!com.acme.RemoteSingleton</lookup-name>
</ejb-ref>
<ejb-local-ref>
<ejb-ref-name>ejb/lookup2</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<local>com.acme.SingletonBean2</local>
- <lookup-name>java:module/SingletonBean2</lookup-name>
+ <lookup-name>java:module/SingletonBean2</lookup-name>
</ejb-local-ref>
</session>
<session>
<ejb-name>SingletonBean2</ejb-name>
- <local-bean/>
- <ejb-class>com.acme.SingletonBean2</ejb-class>
- <session-type>Singleton</session-type>
- <timer>
+ <local-bean/>
+ <ejb-class>com.acme.SingletonBean2</ejb-class>
+ <session-type>Singleton</session-type>
+ <timer>
<description>Sample timer</description>
<schedule>
<minute>*</minute>
- </schedule>
+ </schedule>
<timeout-method>
<method-name>myTimeout</method-name>
- </timeout-method>
- </timer>
- <concurrent-method>
- <method>
+ </timeout-method>
+ </timer>
+ <concurrent-method>
+ <method>
<method-name>foo</method-name>
- </method>
+ </method>
<lock>Write</lock>
<access-timeout>
- <timeout>5</timeout>
- <unit>Seconds</unit>
- </access-timeout>
- </concurrent-method>
+ <timeout>5</timeout>
+ <unit>Seconds</unit>
+ </access-timeout>
+ </concurrent-method>
<concurrent-method>
- <method>
+ <method>
<method-name>foo2</method-name>
- </method>
+ </method>
<lock>Read</lock>
- </concurrent-method>
+ </concurrent-method>
<concurrent-method>
- <method>
+ <method>
<method-name>fooAsync</method-name>
<method-params>
<method-param>int</method-param>
- </method-params>
- </method>
+ </method-params>
+ </method>
<lock>Read</lock>
- </concurrent-method>
- <async-method>
- <method-name>fooAsync</method-name>
+ </concurrent-method>
+ <async-method>
+ <method-name>fooAsync</method-name>
<method-params>
<method-param>int</method-param>
- </method-params>
- </async-method>
+ </method-params>
+ </async-method>
<transaction-type>Container</transaction-type>
<post-construct>
<lifecycle-callback-class>com.acme.SingletonBean2</lifecycle-callback-class>
<lifecycle-callback-method>init</lifecycle-callback-method>
- </post-construct>
+ </post-construct>
<pre-destroy>
<lifecycle-callback-class>com.acme.SingletonBean2</lifecycle-callback-class>
<lifecycle-callback-method>destroy</lifecycle-callback-method>
- </pre-destroy>
+ </pre-destroy>
</session>
<session>
<ejb-name>StatelessBean</ejb-name>
@@ -170,7 +170,7 @@
</async-method>
</session>
<session>
- <ejb-name>MultiBean</ejb-name>
+ <ejb-name>MultiBean</ejb-name>
<env-entry>
<env-entry-name>multi</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
@@ -179,9 +179,9 @@
</session>
<session>
<ejb-name>MultiBean2</ejb-name>
- <local-bean/>
- <ejb-class>com.acme.MultiBean</ejb-class>
- <session-type>Singleton</session-type>
+ <local-bean/>
+ <ejb-class>com.acme.MultiBean</ejb-class>
+ <session-type>Singleton</session-type>
<env-entry>
<env-entry-name>multi</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
@@ -190,9 +190,9 @@
</session>
<session>
<ejb-name>MultiBean3</ejb-name>
- <local-bean/>
- <ejb-class>com.acme.MultiBean</ejb-class>
- <session-type>Singleton</session-type>
+ <local-bean/>
+ <ejb-class>com.acme.MultiBean</ejb-class>
+ <session-type>Singleton</session-type>
<env-entry>
<env-entry-name>multi</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
@@ -202,31 +202,31 @@
<session>
<ejb-name>StatefulBean</ejb-name>
- <local-bean/>
- <ejb-class>com.acme.StatefulBean</ejb-class>
- <session-type>Stateful</session-type>
- <stateful-timeout>
- <timeout>1001</timeout>
+ <local-bean/>
+ <ejb-class>com.acme.StatefulBean</ejb-class>
+ <session-type>Stateful</session-type>
+ <stateful-timeout>
+ <timeout>1001</timeout>
<unit>Minutes</unit>
- </stateful-timeout>
- <concurrency-management-type>Container</concurrency-management-type>
- <async-method>
- <method-name>foo</method-name>
- </async-method>
+ </stateful-timeout>
+ <concurrency-management-type>Container</concurrency-management-type>
+ <async-method>
+ <method-name>foo</method-name>
+ </async-method>
<after-begin-method>
- <method-name>afterBegin</method-name>
- </after-begin-method>
+ <method-name>afterBegin</method-name>
+ </after-begin-method>
<before-completion-method>
- <method-name>beforeCompletion</method-name>
- </before-completion-method>
+ <method-name>beforeCompletion</method-name>
+ </before-completion-method>
<after-completion-method>
- <method-name>afterCompletion</method-name>
+ <method-name>afterCompletion</method-name>
<method-params>
<method-param>boolean</method-param>
- </method-params>
- </after-completion-method>
+ </method-params>
+ </after-completion-method>
</session>
-
+
</enterprise-beans>
<assembly-descriptor>
<container-transaction>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/DateTime.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/DateTime.java
index 21593ed..53ab6f8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/DateTime.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/DateTime.java
@@ -19,38 +19,38 @@
public class DateTime {
-
+
public static void main(String[] args) {
- String xsdDateTime = args[0];
+ String xsdDateTime = args[0];
- System.out.println("Converting xsdDateTime " + xsdDateTime + " ...");
+ System.out.println("Converting xsdDateTime " + xsdDateTime + " ...");
- try {
- DatatypeFactory factory = DatatypeFactory.newInstance();
+ try {
+ DatatypeFactory factory = DatatypeFactory.newInstance();
- XMLGregorianCalendar xmlGreg = factory.newXMLGregorianCalendar(xsdDateTime);
+ XMLGregorianCalendar xmlGreg = factory.newXMLGregorianCalendar(xsdDateTime);
- GregorianCalendar greg = xmlGreg.toGregorianCalendar();
+ GregorianCalendar greg = xmlGreg.toGregorianCalendar();
- Date date = greg.getTime();
+ Date date = greg.getTime();
- System.out.println("Date = " + date);
+ System.out.println("Date = " + date);
- GregorianCalendar reverseCalendar = new GregorianCalendar();
- reverseCalendar.setTime(date);
+ GregorianCalendar reverseCalendar = new GregorianCalendar();
+ reverseCalendar.setTime(date);
- XMLGregorianCalendar reverseXmlGreg =
- factory.newXMLGregorianCalendar(reverseCalendar);
+ XMLGregorianCalendar reverseXmlGreg =
+ factory.newXMLGregorianCalendar(reverseCalendar);
- String reverseXsdDateTime = reverseXmlGreg.toXMLFormat();
+ String reverseXsdDateTime = reverseXmlGreg.toXMLFormat();
- System.out.println("Back to xsdDateTime = " + reverseXsdDateTime);
+ System.out.println("Back to xsdDateTime = " + reverseXsdDateTime);
- } catch(Exception e) {
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java
index 9a54e8c..59fae06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java
@@ -27,36 +27,36 @@
@Resource(name="multi")
private String multi;
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("In init()");
- System.out.println("multi = " + multi);
- try {
- String multiLookup = (String)
- new InitialContext().lookup("java:comp/env/multi");
- if( !multi.equals(multiLookup) ) {
- throw new EJBException("Non-matching values of multi" +
- multi + " : " + multiLookup);
- }
+ System.out.println("In init()");
+ System.out.println("multi = " + multi);
+ try {
+ String multiLookup = (String)
+ new InitialContext().lookup("java:comp/env/multi");
+ if( !multi.equals(multiLookup) ) {
+ throw new EJBException("Non-matching values of multi" +
+ multi + " : " + multiLookup);
+ }
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
}
public String foo() {
- try {
- String multiLookup = (String)
- new InitialContext().lookup("java:comp/env/multi");
- System.out.println("multiLookup = " + multiLookup);
- if( !multi.equals(multiLookup) ) {
- throw new EJBException("Non-matching values of multi" +
- multi + " : " + multiLookup);
- }
- } catch(Exception e) {
- throw new EJBException(e);
- }
- return multi;
+ try {
+ String multiLookup = (String)
+ new InitialContext().lookup("java:comp/env/multi");
+ System.out.println("multiLookup = " + multiLookup);
+ if( !multi.equals(multiLookup) ) {
+ throw new EJBException("Non-matching values of multi" +
+ multi + " : " + multiLookup);
+ }
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
+ return multi;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java
index de2d2dc..0b45215 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java
@@ -31,7 +31,7 @@
public class SingletonBean implements RemoteSingleton {
- @EJB
+ @EJB
private StatefulBean sf;
@Resource
@@ -44,93 +44,93 @@
@PostConstruct
private void init() {
- System.out.println("In SingletonBean::init()");
+ System.out.println("In SingletonBean::init()");
- // Call a method marked as async in .xml. This would block
- // if it's not correctly identified as an async method since
- // we're not out of PostConstruct yet.
- me.foo();
+ // Call a method marked as async in .xml. This would block
+ // if it's not correctly identified as an async method since
+ // we're not out of PostConstruct yet.
+ me.foo();
- SingletonBean2 sb2 = (SingletonBean2)
- ctx.lookup("java:module/SingletonBean2");
+ SingletonBean2 sb2 = (SingletonBean2)
+ ctx.lookup("java:module/SingletonBean2");
- // Call read-lock async method and have it sleep for a little
- // while
- sb2.fooAsync(10);
+ // Call read-lock async method and have it sleep for a little
+ // while
+ sb2.fooAsync(10);
- // Sleep for a short time to allow enough time for fooAsync() to
- // block
- try {
- Thread.sleep(1000);
- } catch(Exception e) {
- e.printStackTrace();
- }
+ // Sleep for a short time to allow enough time for fooAsync() to
+ // block
+ try {
+ Thread.sleep(1000);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
- // Call a sychronous write-lock method with a .xml specified
- // timeout that's less than the fooAsync sleep time
- try {
- sb2.foo();
- throw new EJBException("Should have gotten timeout exception");
- } catch(ConcurrentAccessTimeoutException cate) {
- System.out.println("Got expected timeout exception");
- }
+ // Call a sychronous write-lock method with a .xml specified
+ // timeout that's less than the fooAsync sleep time
+ try {
+ sb2.foo();
+ throw new EJBException("Should have gotten timeout exception");
+ } catch(ConcurrentAccessTimeoutException cate) {
+ System.out.println("Got expected timeout exception");
+ }
- RemoteSingleton lookup1 = (RemoteSingleton)
- ctx.lookup("java:comp/env/ejb/lookup1");
- System.out.println("lookup1 = " + lookup1);
+ RemoteSingleton lookup1 = (RemoteSingleton)
+ ctx.lookup("java:comp/env/ejb/lookup1");
+ System.out.println("lookup1 = " + lookup1);
- SingletonBean2 lookup2 = (SingletonBean2)
- ctx.lookup("java:comp/env/ejb/lookup2");
- System.out.println("lookup2 = " + lookup2);
+ SingletonBean2 lookup2 = (SingletonBean2)
+ ctx.lookup("java:comp/env/ejb/lookup2");
+ System.out.println("lookup2 = " + lookup2);
- // Now call a synchronous read-lock method. This should just
- // proceed.
- sb2.foo2();
+ // Now call a synchronous read-lock method. This should just
+ // proceed.
+ sb2.foo2();
- sf.foo();
+ sf.foo();
- System.out.println("Leaving SingletonBean::init()");
+ System.out.println("Leaving SingletonBean::init()");
}
@AccessTimeout(value=10, unit=TimeUnit.DAYS)
public void foo() {
- System.out.println("In SingletonBean::foo()");
+ System.out.println("In SingletonBean::foo()");
}
@PreDestroy
private void destroy() {
- System.out.println("In SingletonBean::destroy()");
+ System.out.println("In SingletonBean::destroy()");
}
@Schedule(second="1", minute="*", hour="*", persistent=false)
private void mytimeout(Timer t) {
- System.out.println("In SingletonBean::mytimeout, info = " + t.getInfo() + "t = " +
- t.getSchedule());
+ System.out.println("In SingletonBean::mytimeout, info = " + t.getInfo() + "t = " +
+ t.getSchedule());
- try {
- t.getHandle();
- System.out.println("Successfully got handle for persistent timer");
- } catch(IllegalStateException e) {
- throw new EJBException(e);
- }
+ try {
+ t.getHandle();
+ System.out.println("Successfully got handle for persistent timer");
+ } catch(IllegalStateException e) {
+ throw new EJBException(e);
+ }
- if( t.getInfo().equals("info") && t.isPersistent() && t.isCalendarTimer() ) {
- gotTimeout = true;
- } else {
- throw new EJBException("Timer metadata doesn't match descriptor " + t);
- }
+ if( t.getInfo().equals("info") && t.isPersistent() && t.isCalendarTimer() ) {
+ gotTimeout = true;
+ } else {
+ throw new EJBException("Timer metadata doesn't match descriptor " + t);
+ }
}
private void mytimeout2() {
- System.out.println("In SingletonBean::mytimeout");
+ System.out.println("In SingletonBean::mytimeout");
}
private void mytimeout1(Timer t) {
- System.out.println("In SingletonBean::mytimeout1");
+ System.out.println("In SingletonBean::mytimeout1");
}
public boolean getTestResult() {
- System.out.println("In SingletonBean::testPassed");
- return gotTimeout;
+ System.out.println("In SingletonBean::testPassed");
+ return gotTimeout;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean2.java
index 49c0b6e..89460a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean2.java
@@ -21,10 +21,10 @@
private int initTx = -1;
private void init() {
- System.out.println("In SingletonBean2::init()");
+ System.out.println("In SingletonBean2::init()");
try {
javax.naming.InitialContext ic = new javax.naming.InitialContext();
- jakarta.transaction.TransactionSynchronizationRegistry tr =
+ jakarta.transaction.TransactionSynchronizationRegistry tr =
(jakarta.transaction.TransactionSynchronizationRegistry)
ic.lookup("java:comp/TransactionSynchronizationRegistry");
System.out.println("In SingletonBean2::init() tx status: " + tr.getTransactionStatus());
@@ -35,32 +35,32 @@
}
public void foo() {
- System.out.println("In SingletonBean2::foo()");
+ System.out.println("In SingletonBean2::foo()");
}
- public void foo2() {
- System.out.println("In SingletonBean2::foo2()");
+ public void foo2() {
+ System.out.println("In SingletonBean2::foo2()");
if (initTx != 6)
throw new RuntimeException("initTx is " + initTx);
}
public void fooAsync(int sleepSeconds) {
- System.out.println("In SingletonBean2::fooAsync() Sleeping for " +
- sleepSeconds + " seconds...");
- try {
- Thread.sleep(sleepSeconds * 1000);
- } catch(Exception e) {
- e.printStackTrace();
- }
- System.out.println("fooAsync() awoke from Sleep");
+ System.out.println("In SingletonBean2::fooAsync() Sleeping for " +
+ sleepSeconds + " seconds...");
+ try {
+ Thread.sleep(sleepSeconds * 1000);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ System.out.println("fooAsync() awoke from Sleep");
}
private void destroy() {
- System.out.println("In SingletonBean2::destroy()");
+ System.out.println("In SingletonBean2::destroy()");
}
private void myTimeout() {
- System.out.println("In SingletonBen2::myTimeout()");
+ System.out.println("In SingletonBen2::myTimeout()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java
index 6e7b9e7..7192381 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java
@@ -21,27 +21,27 @@
public class StatefulBean {
- @EJB private StatelessBean slsb;
+ @EJB private StatelessBean slsb;
public void foo() {
- slsb.foo();
-
+ slsb.foo();
+
}
public void afterBegin() {
- System.out.println("In StatefulBean::afterBegin");
+ System.out.println("In StatefulBean::afterBegin");
}
private void beforeCompletion() {
- System.out.println("In StatefulBean::beforeCompletion");
+ System.out.println("In StatefulBean::beforeCompletion");
}
void afterCompletion(boolean committed) {
- System.out.println("In StatefulBean::afterCompletion c = " +
- committed);
+ System.out.println("In StatefulBean::afterCompletion c = " +
+ committed);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java
index d134582..e8d4ee7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java
@@ -27,23 +27,23 @@
public void foo() {
- System.out.println("In StatelessBean::foo");
-
- String multi1Str = multi1.foo();
- String multi2Str = multi2.foo();
- String multi3Str = multi3.foo();
+ System.out.println("In StatelessBean::foo");
- System.out.println("multi1 = " + multi1Str);
- System.out.println("multi2 = " + multi2Str);
- System.out.println("multi3 = " + multi3Str);
+ String multi1Str = multi1.foo();
+ String multi2Str = multi2.foo();
+ String multi3Str = multi3.foo();
- if( /**!multi1Str.equals("1") || **/
- !multi2Str.equals("2") ||
- !multi3Str.equals("3") ) {
- throw new EJBException("Invalid multi values");
+ System.out.println("multi1 = " + multi1Str);
+ System.out.println("multi2 = " + multi2Str);
+ System.out.println("multi3 = " + multi3Str);
- }
-
+ if( /**!multi1Str.equals("1") || **/
+ !multi2Str.equals("2") ||
+ !multi3Str.equals("3") ) {
+ throw new EJBException("Invalid multi values");
+
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.properties
index c510260..2147ca5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-sfsbscnc"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.xml
index 99367fb..61ad649 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -73,7 +73,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java
index 6942a4c..349267b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -43,121 +43,121 @@
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- num = Integer.valueOf(args[1]);
+ num = Integer.valueOf(args[1]);
}
public void doTest() {
- try {
+ try {
- serializedBean = (StatefulCncSuperIntf) new InitialContext().lookup("java:global/" + appName + "/StatefulBeanSerialized!com.acme.StatefulCncRemote");
+ serializedBean = (StatefulCncSuperIntf) new InitialContext().lookup("java:global/" + appName + "/StatefulBeanSerialized!com.acme.StatefulCncRemote");
- nonSerializedBean = (StatefulCncSuperIntf) new InitialContext().lookup("java:global/" + appName + "/StatefulBeanNotSerialized!com.acme.StatefulCncRemote");
+ nonSerializedBean = (StatefulCncSuperIntf) new InitialContext().lookup("java:global/" + appName + "/StatefulBeanNotSerialized!com.acme.StatefulCncRemote");
- nonSerializedBean.sleep(3);
+ nonSerializedBean.sleep(3);
- try {
- System.out.println("Sleep a small amount to make sure the async method" +
- "is dispatched before we make the next call...");
- Thread.sleep(500);
- nonSerializedBean.hello();
- throw new EJBException("Did not receive concurrent access exception");
- } catch(ConcurrentAccessException cae) {
- System.out.println("Successfully received concurrent access exception for " +
- " concurrent access attempt on non-serialized sfsb");
- }
+ try {
+ System.out.println("Sleep a small amount to make sure the async method" +
+ "is dispatched before we make the next call...");
+ Thread.sleep(500);
+ nonSerializedBean.hello();
+ throw new EJBException("Did not receive concurrent access exception");
+ } catch(ConcurrentAccessException cae) {
+ System.out.println("Successfully received concurrent access exception for " +
+ " concurrent access attempt on non-serialized sfsb");
+ }
- try {
- serializedBean.sleep(3);
- try {
- System.out.println("Sleep a small amount to make sure the async method" +
- "is dispatched before we make the next call...");
- Thread.sleep(100);
- serializedBean.helloWait();
- throw new EJBException("Should have received timeout exception");
- } catch(ConcurrentAccessTimeoutException cate) {
- System.out.println("Successfully received timeout exception");
- }
+ try {
+ serializedBean.sleep(3);
+ try {
+ System.out.println("Sleep a small amount to make sure the async method" +
+ "is dispatched before we make the next call...");
+ Thread.sleep(100);
+ serializedBean.helloWait();
+ throw new EJBException("Should have received timeout exception");
+ } catch(ConcurrentAccessTimeoutException cate) {
+ System.out.println("Successfully received timeout exception");
+ }
- System.out.println("Attempt loopback call");
- serializedBean.attemptLoopback();
+ System.out.println("Attempt loopback call");
+ serializedBean.attemptLoopback();
- // Invoking the same bean must still work since the concurrent access
- // exceptions do not result in the bean being destroyed
- String result = serializedBean.hello();
- System.out.println("Serialized bean says " + result);
+ // Invoking the same bean must still work since the concurrent access
+ // exceptions do not result in the bean being destroyed
+ String result = serializedBean.hello();
+ System.out.println("Serialized bean says " + result);
- } catch(ConcurrentAccessException cae) {
- throw new EJBException("Shouldn't have received concurrent access exception");
- }
+ } catch(ConcurrentAccessException cae) {
+ throw new EJBException("Shouldn't have received concurrent access exception");
+ }
- nonSerializedBean.attemptLoopback();
+ nonSerializedBean.attemptLoopback();
- remoteAsync = (RemoteAsync) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
- remoteAsync.startTest();
-
- ExecutorService executor = Executors.newCachedThreadPool();
+ remoteAsync = (RemoteAsync) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+ remoteAsync.startTest();
- IncrementCount ics[] = new IncrementCount[num];
- for(int i = 0; i < ics.length; i++) {
+ ExecutorService executor = Executors.newCachedThreadPool();
- ics[i] = new IncrementCount();
+ IncrementCount ics[] = new IncrementCount[num];
+ for(int i = 0; i < ics.length; i++) {
- executor.execute( ics[i] );
- }
+ ics[i] = new IncrementCount();
- executor.shutdown();
+ executor.execute( ics[i] );
+ }
- executor.awaitTermination(15, TimeUnit.SECONDS);
+ executor.shutdown();
- int count = serializedBean.getCount();
+ executor.awaitTermination(15, TimeUnit.SECONDS);
- if( count == num ) {
- System.out.println("Total count of " + count + " invocations is correct");
- } else {
- throw new EJBException("Wrong count total = " + count);
- }
+ int count = serializedBean.getCount();
- // Now put the bean to sleep and make a blocking 2nd call. The first method
- // is a @Remove method so when the blocking call awakes we should get the
- // appropriate exception.
- serializedBean.sleepAndRemove(3);
+ if( count == num ) {
+ System.out.println("Total count of " + count + " invocations is correct");
+ } else {
+ throw new EJBException("Wrong count total = " + count);
+ }
- try {
- System.out.println("Sleep a small amount to make sure the async method" +
- "is dispatched before we make the next call...");
- Thread.sleep(100);
- serializedBean.hello();
- throw new EJBException("Did not receive NoSuchEJBException");
- } catch(NoSuchEJBException nse) {
- System.out.println("Successfully received NoSuchEJBException for " +
- " concurrent access attempt on removed sfsb");
- }
+ // Now put the bean to sleep and make a blocking 2nd call. The first method
+ // is a @Remove method so when the blocking call awakes we should get the
+ // appropriate exception.
+ serializedBean.sleepAndRemove(3);
+
+ try {
+ System.out.println("Sleep a small amount to make sure the async method" +
+ "is dispatched before we make the next call...");
+ Thread.sleep(100);
+ serializedBean.hello();
+ throw new EJBException("Did not receive NoSuchEJBException");
+ } catch(NoSuchEJBException nse) {
+ System.out.println("Successfully received NoSuchEJBException for " +
+ " concurrent access attempt on removed sfsb");
+ }
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
class IncrementCount implements Runnable {
- public void run() {
- serializedBean.incrementCount(1);
- }
+ public void run() {
+ serializedBean.incrementCount(1);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java
index 97a24c8..ac3e85d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java
@@ -24,6 +24,6 @@
void startTest();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java
index ef4b71f..3a9a1ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java
@@ -39,9 +39,9 @@
}
public void startTest() {
- System.out.println("in SingletonBean::startTest()");
- // reset state
- return;
+ System.out.println("in SingletonBean::startTest()");
+ // reset state
+ return;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java
index 35f62d3..84f56af 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java
@@ -39,31 +39,31 @@
@Asynchronous
public void sleep(int seconds) {
- System.out.println("In StatefulBeanNotSerialized::asyncSleep");
- try {
- System.out.println("Sleeping for " + seconds + " seconds...");
- Thread.sleep(seconds * 1000);
- System.out.println("Woke up from sleep");
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e);
- }
+ System.out.println("In StatefulBeanNotSerialized::asyncSleep");
+ try {
+ System.out.println("Sleeping for " + seconds + " seconds...");
+ Thread.sleep(seconds * 1000);
+ System.out.println("Woke up from sleep");
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException(e);
+ }
}
public String hello() {
- System.out.println("In StatefulBeanNotSerialized::hello");
- return "hello, world!\n";
+ System.out.println("In StatefulBeanNotSerialized::hello");
+ return "hello, world!\n";
}
public void attemptLoopback() {
- System.out.println("In StatefulBeanNotSerialized::attemptLoopback");
- StatefulCncSuperIntf me = sessionCtx.getBusinessObject(StatefulCncLocal.class);
- try {
- me.hello();
- throw new EJBException("Should have received concurrent access ex");
- } catch(ConcurrentAccessException cae) {
- System.out.println("Successfully received concurent access exception");
- }
+ System.out.println("In StatefulBeanNotSerialized::attemptLoopback");
+ StatefulCncSuperIntf me = sessionCtx.getBusinessObject(StatefulCncLocal.class);
+ try {
+ me.hello();
+ throw new EJBException("Should have received concurrent access ex");
+ } catch(ConcurrentAccessException cae) {
+ System.out.println("Successfully received concurent access exception");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java
index 84f9e38..abb7705 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java
@@ -32,14 +32,14 @@
}
public void attemptLoopback() {
- System.out.println("In StatefulBeanSerialized::attemptLoopback");
- StatefulCncSuperIntf me = sessionCtx.getBusinessObject(StatefulCncLocal.class);
- try {
- me.hello();
- throw new EJBException("Should have received loopback ex");
- } catch(IllegalLoopbackException ile) {
- System.out.println("Successfully received loopback exception");
- }
+ System.out.println("In StatefulBeanSerialized::attemptLoopback");
+ StatefulCncSuperIntf me = sessionCtx.getBusinessObject(StatefulCncLocal.class);
+ try {
+ me.hello();
+ throw new EJBException("Should have received loopback ex");
+ } catch(IllegalLoopbackException ile) {
+ System.out.println("Successfully received loopback exception");
+ }
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java
index 59c4f9f..1642024 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java
@@ -29,63 +29,63 @@
@AccessTimeout(-1)
public String hello() {
- System.out.println("In StatefulBeanSuper::hello");
- return "hello, world!\n";
+ System.out.println("In StatefulBeanSuper::hello");
+ return "hello, world!\n";
}
@AccessTimeout(value=100, unit=TimeUnit.NANOSECONDS)
public String helloWait() {
- System.out.println("In StatefulBeanSuper::helloWait");
- return "hello, world!\n";
+ System.out.println("In StatefulBeanSuper::helloWait");
+ return "hello, world!\n";
}
-
+
@Asynchronous
public Future<String> helloAsync() {
- System.out.println("In StatefulBeanSuper::helloAsync");
- return new AsyncResult<String>("hello");
+ System.out.println("In StatefulBeanSuper::helloAsync");
+ return new AsyncResult<String>("hello");
}
@Asynchronous
public void fireAndForget() {
- System.out.println("In StatefulBeanSuper::fireAndForget");
+ System.out.println("In StatefulBeanSuper::fireAndForget");
}
@Asynchronous
public void sleep(int seconds) {
- System.out.println("In StatefulBeanSuper::asyncSleep");
- try {
- System.out.println("Sleeping for " + seconds + " seconds...");
- Thread.sleep(seconds * 1000);
- System.out.println("Woke up from sleep");
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e);
- }
+ System.out.println("In StatefulBeanSuper::asyncSleep");
+ try {
+ System.out.println("Sleeping for " + seconds + " seconds...");
+ Thread.sleep(seconds * 1000);
+ System.out.println("Woke up from sleep");
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException(e);
+ }
}
@Asynchronous
@Remove
public void sleepAndRemove(int seconds) {
- System.out.println("In StatefulBeanSuper::sleepAndRemove");
- try {
- System.out.println("Sleeping for " + seconds + " seconds...");
- Thread.sleep(seconds * 1000);
- System.out.println("Woke up from sleep. I will now be removed...");
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e);
- }
+ System.out.println("In StatefulBeanSuper::sleepAndRemove");
+ try {
+ System.out.println("Sleeping for " + seconds + " seconds...");
+ Thread.sleep(seconds * 1000);
+ System.out.println("Woke up from sleep. I will now be removed...");
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException(e);
+ }
}
public void incrementCount(int seconds) {
- System.out.println("In StatefulBeanSuper::incrementCount(" + seconds + ")");
- // increment count but wait a bit to try force serialization
- sleep(seconds);
- count++;
- System.out.println("Count = " + count);
+ System.out.println("In StatefulBeanSuper::incrementCount(" + seconds + ")");
+ // increment count but wait a bit to try force serialization
+ sleep(seconds);
+ count++;
+ System.out.println("Count = " + count);
}
public int getCount() {
- return count;
+ return count;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java
index e248283..aa91d74 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java
@@ -24,7 +24,7 @@
public String hello();
public String helloWait();
-
+
public Future<String> helloAsync();
public void fireAndForget();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.properties
index 0329892..d791fd1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-webejb"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.xml
index b87c3a4..39bc144 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
@@ -48,9 +48,9 @@
<antcall target="webclient-war-common">
<param name="hasWebclient" value="false"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,9 +58,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java
index 03cdc87..0b917cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java
@@ -49,68 +49,68 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
+ System.out.println("In HelloServlet::init");
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- try {
- HelloStateful sful = (HelloStateful) new InitialContext().lookup("java:comp/env/helloStateful");
- sful.hello();
- hello.foo();
- } catch(Exception e) {
- e.printStackTrace();
- }
+ try {
+ HelloStateful sful = (HelloStateful) new InitialContext().lookup("java:comp/env/helloStateful");
+ sful.hello();
+ hello.foo();
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
- System.out.println("Remote intf bean says " +
- helloRemote.hello());
+ System.out.println("Remote intf bean says " +
+ helloRemote.hello());
- System.out.println("Calling testNoWait. This one should work since it's not a concurrent invocation");
- singleton.testNoWait();
+ System.out.println("Calling testNoWait. This one should work since it's not a concurrent invocation");
+ singleton.testNoWait();
- System.out.println("Call async wait, then sleep a bit to make sure it takes affect");
- singleton.asyncWait(1);
- try {
- // Sleep a bit to make sure async call processes before we proceed
- Thread.sleep(100);
- } catch(Exception e) {
- System.out.println(e);
- }
+ System.out.println("Call async wait, then sleep a bit to make sure it takes affect");
+ singleton.asyncWait(1);
+ try {
+ // Sleep a bit to make sure async call processes before we proceed
+ Thread.sleep(100);
+ } catch(Exception e) {
+ System.out.println(e);
+ }
- try {
- System.out.println("Calling testNoWait");
- singleton.testNoWait();
- throw new RuntimeException("Expected ConcurrentAccessException");
- } catch(ConcurrentAccessTimeoutException cate) {
- throw new RuntimeException("Expected ConcurrentAccessException");
- } catch(ConcurrentAccessException cae) {
- System.out.println("Got expected exception for concurrent access on method with 0 wait");
- }
+ try {
+ System.out.println("Calling testNoWait");
+ singleton.testNoWait();
+ throw new RuntimeException("Expected ConcurrentAccessException");
+ } catch(ConcurrentAccessTimeoutException cate) {
+ throw new RuntimeException("Expected ConcurrentAccessException");
+ } catch(ConcurrentAccessException cae) {
+ System.out.println("Got expected exception for concurrent access on method with 0 wait");
+ }
- singleton.wait(10);
+ singleton.wait(10);
- singleton.reentrantReadWrite();
+ singleton.reentrantReadWrite();
- singleton.callSing2WithTxAndRollback();
- singleton.hello();
+ singleton.callSing2WithTxAndRollback();
+ singleton.hello();
- singleton.read();
- singleton.write();
- singleton.reentrantReadRead();
- singleton.reentrantWriteWrite();
- singleton.reentrantWriteRead();
+ singleton.read();
+ singleton.write();
+ singleton.reentrantReadRead();
+ singleton.reentrantWriteWrite();
+ singleton.reentrantWriteRead();
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java
index 068370c..19d22b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java
@@ -26,7 +26,7 @@
@AccessTimeout(value=10, unit=TimeUnit.SECONDS)
public class HelloSingleton extends Super1 {
- @EJB
+ @EJB
Hello hello;
@EJB
@@ -35,146 +35,146 @@
@EJB
private HelloSingleton2 sing2;
- @Resource
+ @Resource
private SessionContext sesCtx;
-
+
private HelloSingleton me;
- @PostConstruct
+ @PostConstruct
//@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
private void init() {
- System.out.println("HelloSingleton::init()");
- me = sesCtx.getBusinessObject(HelloSingleton.class);
+ System.out.println("HelloSingleton::init()");
+ me = sesCtx.getBusinessObject(HelloSingleton.class);
- TimerService ts = sesCtx.getTimerService();
- ts.createTimer(2000, "");
- System.out.println("Created timer in HelloSingleton");
+ TimerService ts = sesCtx.getTimerService();
+ ts.createTimer(2000, "");
+ System.out.println("Created timer in HelloSingleton");
- slsb.hello();
+ slsb.hello();
- slsb.helloAsync();
+ slsb.helloAsync();
- //throw new EJBException("force PostConstruct failure");
+ //throw new EJBException("force PostConstruct failure");
}
@Timeout
@Lock(LockType.WRITE)
public void timeout(Timer t) {
- System.out.println("In HelloSingleton::timeout");
+ System.out.println("In HelloSingleton::timeout");
}
public void callSing2WithTxAndRollback() {
- // Call Singleton 2 with a transaction
- // If it's initialized lazily as a side-effect of this
- // invocation, the fact that we rollback our transaction
- // should not impact any transactional work performed in
- // its CMT/TX_REQUIRED constructor.
- try {
- // Executes in its own transaction but throws a runtime exception.
- sing2.hello1();
- } catch(EJBException e) {
- // Catch the runtime exception so it doesn't affect the client
- // tx (yet)
- }
+ // Call Singleton 2 with a transaction
+ // If it's initialized lazily as a side-effect of this
+ // invocation, the fact that we rollback our transaction
+ // should not impact any transactional work performed in
+ // its CMT/TX_REQUIRED constructor.
+ try {
+ // Executes in its own transaction but throws a runtime exception.
+ sing2.hello1();
+ } catch(EJBException e) {
+ // Catch the runtime exception so it doesn't affect the client
+ // tx (yet)
+ }
- // Make sure we can still call the singleton after a
- // runtime exception
- sing2.hello2();
+ // Make sure we can still call the singleton after a
+ // runtime exception
+ sing2.hello2();
- sesCtx.setRollbackOnly();
+ sesCtx.setRollbackOnly();
- System.out.println("Exiting HelloSingleton::callSing2WithTxAndRollback");
+ System.out.println("Exiting HelloSingleton::callSing2WithTxAndRollback");
}
public void wait(int seconds) {
- try {
- System.out.println("In HelloSingleton::wait. Sleeping with lock...");
- Thread.sleep(seconds * 1000);
- System.out.println("Awake in HelloSingleton::wait. Releasing lock...");
- } catch(Exception e) {
- System.out.println(e);
- }
+ try {
+ System.out.println("In HelloSingleton::wait. Sleeping with lock...");
+ Thread.sleep(seconds * 1000);
+ System.out.println("Awake in HelloSingleton::wait. Releasing lock...");
+ } catch(Exception e) {
+ System.out.println(e);
+ }
}
@Asynchronous
public void asyncWait(int seconds) {
- me.wait(seconds);
+ me.wait(seconds);
}
@AccessTimeout(value=5, unit=TimeUnit.MILLISECONDS)
public String hello() {
-
- System.out.println("get invoked interface = " +
- sesCtx.getInvokedBusinessInterface());
- HelloStateful sful = (HelloStateful) sesCtx.lookup("helloStateful");
- sful.hello();
- hello.foo();
- sful.goodbye();
+ System.out.println("get invoked interface = " +
+ sesCtx.getInvokedBusinessInterface());
- return "hello, world!\n";
+ HelloStateful sful = (HelloStateful) sesCtx.lookup("helloStateful");
+ sful.hello();
+ hello.foo();
+ sful.goodbye();
+
+ return "hello, world!\n";
}
@Lock(LockType.READ)
public void read() {
- System.out.println("In HelloSingleton::read()");
+ System.out.println("In HelloSingleton::read()");
}
public void write() {
- System.out.println("In HelloSingleton::write()");
+ System.out.println("In HelloSingleton::write()");
}
@Lock(LockType.READ)
public void reentrantReadRead() {
- System.out.println("In HelloSingleton::ReentrantReadRead()");
- me.read();
+ System.out.println("In HelloSingleton::ReentrantReadRead()");
+ me.read();
}
@Lock(LockType.READ)
public void reentrantReadWrite() {
- System.out.println("In HelloSingleton::ReentrantReadWrite()");
- try {
- me.write();
- throw new EJBException("Expected illegal loopback exception");
- } catch(IllegalLoopbackException ile) {
- System.out.println("Successfully caused illegal loopback");
- }
+ System.out.println("In HelloSingleton::ReentrantReadWrite()");
+ try {
+ me.write();
+ throw new EJBException("Expected illegal loopback exception");
+ } catch(IllegalLoopbackException ile) {
+ System.out.println("Successfully caused illegal loopback");
+ }
}
public void reentrantWriteRead() {
- System.out.println("In HelloSingleton::ReentrantWriteRead()");
- me.read();
+ System.out.println("In HelloSingleton::ReentrantWriteRead()");
+ me.read();
}
public void reentrantWriteWrite() {
- System.out.println("In HelloSingleton::ReentrantWriteWrite()");
- me.write();
+ System.out.println("In HelloSingleton::ReentrantWriteWrite()");
+ me.write();
}
@AccessTimeout(0)
public void testNoWait() {
- System.out.println("In HelloSingleton::testNoWait");
+ System.out.println("In HelloSingleton::testNoWait");
}
@PreDestroy
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
private void destroy() {
- System.out.println("HelloSingleton::destroy()");
+ System.out.println("HelloSingleton::destroy()");
}
}
-
+
/*
@Lock(LockType.WRITE)
class Super2 {
- @Lock(LockType.READ)
- public void super2() {}
+ @Lock(LockType.READ)
+ public void super2() {}
- public void super22() {}
+ public void super22() {}
}
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java
index 17af94f..05931bd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java
@@ -28,51 +28,51 @@
//@Resource
// private UserTransaction ut;
- @Resource
+ @Resource
private SessionContext sesCtx;
@PostConstruct
public void init() {
- System.out.println("In HelloSingleton2::init()");
- UserTransaction ut = sesCtx.getUserTransaction();
+ System.out.println("In HelloSingleton2::init()");
+ UserTransaction ut = sesCtx.getUserTransaction();
try {
- ut.begin();
- TimerService ts = sesCtx.getTimerService();
- ts.createTimer(2000, "");
- ut.commit();
+ ut.begin();
+ TimerService ts = sesCtx.getTimerService();
+ ts.createTimer(2000, "");
+ ut.commit();
} catch(Exception e) {
- try {
- ut.rollback();
- } catch(Exception e1) { e1.printStackTrace(); }
- e.printStackTrace();
- }
- //throw new EJBException("HelloSingleton2 :: force init failure");
+ try {
+ ut.rollback();
+ } catch(Exception e1) { e1.printStackTrace(); }
+ e.printStackTrace();
+ }
+ //throw new EJBException("HelloSingleton2 :: force init failure");
}
- @PreDestroy
+ @PreDestroy
public void destroy() {
- System.out.println("In HelloSingleton2::destroy");
+ System.out.println("In HelloSingleton2::destroy");
}
- @Timeout
+ @Timeout
public void timeout(Timer t) {
- System.out.println("In HelloSingleton2::timeout");
+ System.out.println("In HelloSingleton2::timeout");
}
//@Schedule(second="15", minute="*", persistent=false)
public void refresh() {
- System.out.println("In HelloSingleton2:refresh()");
+ System.out.println("In HelloSingleton2:refresh()");
}
//@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
public void hello1() {
- throw new EJBException("HelloSingleton2::hello1 -- force business method runtime exception");
- //System.out.println("In HelloSingleton2:hello1()");
+ throw new EJBException("HelloSingleton2::hello1 -- force business method runtime exception");
+ //System.out.println("In HelloSingleton2:hello1()");
}
public void hello2() {
- System.out.println("In HelloSingleton2:hello2()");
+ System.out.println("In HelloSingleton2:hello2()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java
index d908d14..01ee9fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java
@@ -36,26 +36,26 @@
// invalid @EJB java.util.Observable sf22;
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("HelloStateful::init()");
- me = sesCtx.getBusinessObject(HelloStateful.class);
+ System.out.println("HelloStateful::init()");
+ me = sesCtx.getBusinessObject(HelloStateful.class);
}
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
public String hello() {
-
- System.out.println("get invoked interface = " +
- sesCtx.getInvokedBusinessInterface() );
-
- sf2.hello();
- sf2.goodbye();
- return "hello, world!\n";
+ System.out.println("get invoked interface = " +
+ sesCtx.getInvokedBusinessInterface() );
+
+ sf2.hello();
+ sf2.goodbye();
+
+ return "hello, world!\n";
}
public void foo() {
- System.out.println("In HelloStateful::foo");
+ System.out.println("In HelloStateful::foo");
}
@Remove
@@ -63,23 +63,23 @@
@PreDestroy
private void destroy() {
- System.out.println("HelloStateful::destroy()");
+ System.out.println("HelloStateful::destroy()");
}
@AfterBegin
- private void afterBegin() {
- System.out.println("In HelloStateful::afterBegin()");
+ private void afterBegin() {
+ System.out.println("In HelloStateful::afterBegin()");
}
@BeforeCompletion
- protected void beforeCompletion() {
- System.out.println("In HelloStateful::beforeCompletion()");
+ protected void beforeCompletion() {
+ System.out.println("In HelloStateful::beforeCompletion()");
}
@AfterCompletion
void afterCompletion(boolean committed) {
- System.out.println("In HelloStateful::afterCompletion(). Committed = " +
- committed);
+ System.out.println("In HelloStateful::afterCompletion(). Committed = " +
+ committed);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java
index bed2194..7a18e67 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java
@@ -23,14 +23,14 @@
@LocalBean
public class HelloStateful2 implements java.util.Observer {
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("HelloStateful2::init()");
+ System.out.println("HelloStateful2::init()");
}
public String hello() {
- System.out.println("In HelloStateful2::hello()");
- return "hello, world!\n";
+ System.out.println("In HelloStateful2::hello()");
+ return "hello, world!\n";
}
@@ -39,12 +39,12 @@
@PreDestroy
private void destroy() {
- System.out.println("HelloStateful2::destroy()");
+ System.out.println("HelloStateful2::destroy()");
}
// not part of public interface
public void update(java.util.Observable o, Object a) {
- throw new EJBException("shouldn't be invoked by client");
+ throw new EJBException("shouldn't be invoked by client");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java
index 8718981..44ce49a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java
@@ -23,24 +23,24 @@
@LocalBean
public class HelloStateless implements HelloRemote {
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("HelloStateless::init()");
+ System.out.println("HelloStateless::init()");
}
public String hello() {
- System.out.println("In HelloStateless::hello()");
- return "hello, world!\n";
+ System.out.println("In HelloStateless::hello()");
+ return "hello, world!\n";
}
@Asynchronous
public void helloAsync() {
- System.out.println("In HelloStateless::helloAsync()");
+ System.out.println("In HelloStateless::helloAsync()");
}
@PreDestroy
private void destroy() {
- System.out.println("HelloStateless::destroy()");
+ System.out.println("HelloStateless::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java
index 04f10bd..5ab379f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java
@@ -24,15 +24,15 @@
@Lock(LockType.READ)
public class Super1 /*extends Super2*/ {
- public void super1() {}
+ public void super1() {}
- @Lock(LockType.WRITE)
- public void super11() {}
+ @Lock(LockType.WRITE)
+ public void super11() {}
@AccessTimeout(value=44544, unit=TimeUnit.HOURS)
- private void foobar() {}
+ private void foobar() {}
@AccessTimeout(value=44544, unit=TimeUnit.HOURS)
- public String hello() { return ""; }
+ public String hello() { return ""; }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/build.xml
index d01a390..fd67838 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/build.xml
@@ -39,9 +39,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-security tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-security tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.properties
index 354488f..021accb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-security-simple"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="appclientjar.files" value="${build.classes.dir}"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="application-client.xml"
+<property name="application-client.xml"\u0020
value="descriptor/application-client.xml"/>
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.xml
index 558e3d2..bcc50ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.xml
@@ -35,13 +35,13 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
</antcall>
- <javac classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
-
+ <javac classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
+
</javac>
</target>
@@ -69,15 +69,15 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
- value="**/Singleton*.class,**/Hello*.class"/>
- <param name="appclientjar.classes"
+ <param name="ejbjar.classes"
+ value="**/Singleton*.class,**/Hello*.class"/>
+ <param name="appclientjar.classes"
value="**/Client.class,**/FooManagedBean*.class,**/Hello*.class"/>
</antcall>
- </target>
+ </target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -85,7 +85,7 @@
<target name="run_bob" depends="init-common">
<exec executable="${APPCLIENT}" failonerror="false">
- <env key="APPCPATH" file="${env.APS_HOME}/lib/reporter.jar"/>
+ <env key="APPCPATH" file="${env.APS_HOME}/lib/reporter.jar"/>
<arg line="-client
${assemble.dir}/${appname}AppClient.jar"/>
@@ -100,7 +100,7 @@
<target name="run_mary" depends="init-common">
<exec executable="${APPCLIENT}" failonerror="false">
- <env key="APPCPATH" file="${env.APS_HOME}/lib/reporter.jar"/>
+ <env key="APPCPATH" file="${env.APS_HOME}/lib/reporter.jar"/>
<arg line="-client
${assemble.dir}/${appname}AppClient.jar"/>
@@ -112,9 +112,9 @@
</exec>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -126,7 +126,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java
index 99320c0..5745ab8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java
@@ -30,7 +30,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -54,19 +54,19 @@
static String appNameL;
- @EJB(lookup="java:app/env/forappclient")
+ @EJB(lookup="java:app/env/forappclient")
static Hello hello3;
- @EJB(mappedName="java:app/ejb-ejb31-security-simple-ejb/SingletonBean!com.acme.Hello")
+ @EJB(mappedName="java:app/ejb-ejb31-security-simple-ejb/SingletonBean!com.acme.Hello")
static Hello hello4;
- @EJB(name="java:app/env/appclientdefinedejbref1")
+ @EJB(name="java:app/env/appclientdefinedejbref1")
static Hello hello5;
- @EJB(name="java:app/appclientdefinedejbref2")
+ @EJB(name="java:app/appclientdefinedejbref2")
static Hello hello6;
- @EJB(name="java:global/appclientdefinedejbref3")
+ @EJB(name="java:global/appclientdefinedejbref3")
static Hello hello7;
@Resource(name="java:app/env/enventry1")
@@ -85,54 +85,54 @@
@PostConstruct
public static void init() {
- try {
- System.out.println("In init()");
+ try {
+ System.out.println("In init()");
- appClient = true;
+ appClient = true;
- System.out.println("AppName = " + appNameL);
- System.out.println("ModuleName = " + moduleName);
+ System.out.println("AppName = " + appNameL);
+ System.out.println("ModuleName = " + moduleName);
- fooMb.hello();
- fooMb2.hello();
- fooMb3.hello();
+ fooMb.hello();
+ fooMb2.hello();
+ fooMb3.hello();
- Integer envEntry = (Integer)
- new InitialContext().lookup("java:app/env/value1");
- System.out.println("java:app/env/value1 = " + envEntry);
-
- System.out.println("java:app/env/enventry1 = " + envEntry1);
- System.out.println("java:global/enventry2 = " + envEntry2);
- System.out.println("java:global/enventry3 = " + envEntry3);
- if( (envEntry3 == null) || envEntry3.intValue() != 18338 ) {
- throw new RuntimeException("invalid enventry3 value");
- }
-
- System.out.println("java:global/enventry4 = " + envEntry4);
- if( (envEntry4 == null) || envEntry4.intValue() != 18338 ) {
- throw new RuntimeException("invalid enventry4 value");
- }
+ Integer envEntry = (Integer)
+ new InitialContext().lookup("java:app/env/value1");
+ System.out.println("java:app/env/value1 = " + envEntry);
- FooManagedBean fmbl = (FooManagedBean) new InitialContext().lookup("java:module/FooManagedBean");
- fmbl.hello();
+ System.out.println("java:app/env/enventry1 = " + envEntry1);
+ System.out.println("java:global/enventry2 = " + envEntry2);
+ System.out.println("java:global/enventry3 = " + envEntry3);
+ if( (envEntry3 == null) || envEntry3.intValue() != 18338 ) {
+ throw new RuntimeException("invalid enventry3 value");
+ }
- FooManagedBean fmbl2 = (FooManagedBean) new InitialContext().lookup("java:app/ejb-ejb31-security-simple-client/FooManagedBean");
- fmbl2.hello();
+ System.out.println("java:global/enventry4 = " + envEntry4);
+ if( (envEntry4 == null) || envEntry4.intValue() != 18338 ) {
+ throw new RuntimeException("invalid enventry4 value");
+ }
- } catch(NamingException e) {
- throw new RuntimeException(e);
- }
+ FooManagedBean fmbl = (FooManagedBean) new InitialContext().lookup("java:module/FooManagedBean");
+ fmbl.hello();
+
+ FooManagedBean fmbl2 = (FooManagedBean) new InitialContext().lookup("java:app/ejb-ejb31-security-simple-client/FooManagedBean");
+ fmbl2.hello();
+
+ } catch(NamingException e) {
+ throw new RuntimeException(e);
+ }
}
public static void main(String args[]) {
for (String arg : args) {
System.out.println("Arg: " + arg);
}
- appName = args[0];
- principal = args[1];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ principal = args[1];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -140,156 +140,156 @@
public void doTest() {
- System.out.println("Executing test with user principal " + principal);
- boolean havePermission = principal.equals("bob");
- if( havePermission ) {
- System.out.println("Expecting permission to access protected methods");
- } else {
- System.out.println("NOT expecting permission to access protected methods");
- }
+ System.out.println("Executing test with user principal " + principal);
+ boolean havePermission = principal.equals("bob");
+ if( havePermission ) {
+ System.out.println("Expecting permission to access protected methods");
+ } else {
+ System.out.println("NOT expecting permission to access protected methods");
+ }
- String results;
+ String results;
- try {
-
- /**
- if( !appClient ) {
- System.out.println("In SE client. Using programmatic login");
- ProgrammaticLogin pm = new ProgrammaticLogin();
- pm.login("mary", "mob", "default", true);
- System.out.println("Programmatic login succeeded");
-
- }
- */
+ try {
- // ProgrammaticLogin login = new com.sun.appserv.security.api.ProgrammaticLogin();
-
- if( hello == null ) {
- hello = (Hello) new InitialContext().lookup("java:global/ejb-ejb31-security-simpleApp/ejb-ejb31-security-simple-ejb/SingletonBean!com.acme.Hello");
- } else {
- // In an appclient.
- Hello hello2 = (Hello) new InitialContext().lookup("java:app/env/forappclient");
- System.out.println("java:app/env/forappclient lookup = " + hello2);
- System.out.println("hello3 = " + hello3);
+ /**
+ if( !appClient ) {
+ System.out.println("In SE client. Using programmatic login");
+ ProgrammaticLogin pm = new ProgrammaticLogin();
+ pm.login("mary", "mob", "default", true);
+ System.out.println("Programmatic login succeeded");
- Hello hello5 = (Hello) new InitialContext().lookup("java:app/ejb-ejb31-security-simple-ejb/SingletonBean!com.acme.Hello");
- System.out.println("hello4 = " + hello4);
- System.out.println("hello5 = " + hello5);
- String env = (String) new InitialContext().lookup("java:app/enventryforappclient");
- System.out.println("java:app env entry = " + env);
- }
+ }
+ */
- boolean pass;
+ // ProgrammaticLogin login = new com.sun.appserv.security.api.ProgrammaticLogin();
- try {
- hello.protectedSyncRemote();
- pass = havePermission;
- } catch(EJBAccessException e) {
- pass = !havePermission;
- }
-
+ if( hello == null ) {
+ hello = (Hello) new InitialContext().lookup("java:global/ejb-ejb31-security-simpleApp/ejb-ejb31-security-simple-ejb/SingletonBean!com.acme.Hello");
+ } else {
+ // In an appclient.
+ Hello hello2 = (Hello) new InitialContext().lookup("java:app/env/forappclient");
+ System.out.println("java:app/env/forappclient lookup = " + hello2);
+ System.out.println("hello3 = " + hello3);
- System.out.println("pass = " + pass);
+ Hello hello5 = (Hello) new InitialContext().lookup("java:app/ejb-ejb31-security-simple-ejb/SingletonBean!com.acme.Hello");
+ System.out.println("hello4 = " + hello4);
+ System.out.println("hello5 = " + hello5);
+ String env = (String) new InitialContext().lookup("java:app/enventryforappclient");
+ System.out.println("java:app env entry = " + env);
+ }
- try {
- hello.unprotectedSyncRemote();
- pass = true;
- } catch(EJBAccessException e) {
- pass = false;
- }
+ boolean pass;
+
+ try {
+ hello.protectedSyncRemote();
+ pass = havePermission;
+ } catch(EJBAccessException e) {
+ pass = !havePermission;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
- try {
- Future<Object> future = hello.protectedAsyncRemote();
- Object obj = future.get();
- pass = havePermission;
-
- } catch(ExecutionException ee) {
- if( ee.getCause() instanceof EJBAccessException ) {
- pass = !havePermission;
- } else {
- pass = false;
- }
- }
+ try {
+ hello.unprotectedSyncRemote();
+ pass = true;
+ } catch(EJBAccessException e) {
+ pass = false;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
+
+ try {
+ Future<Object> future = hello.protectedAsyncRemote();
+ Object obj = future.get();
+ pass = havePermission;
+
+ } catch(ExecutionException ee) {
+ if( ee.getCause() instanceof EJBAccessException ) {
+ pass = !havePermission;
+ } else {
+ pass = false;
+ }
+ }
- try {
- Future<Object> future = hello.unprotectedAsyncRemote();
- Object obj = future.get();
- pass = true;
- } catch(ExecutionException ee) {
- pass = false;
- }
+ System.out.println("pass = " + pass);
+
+
+ try {
+ Future<Object> future = hello.unprotectedAsyncRemote();
+ Object obj = future.get();
+ pass = true;
+ } catch(ExecutionException ee) {
+ pass = false;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
- try {
- hello.testProtectedSyncLocal();
- pass = havePermission;
- } catch(EJBAccessException e) {
- pass = !havePermission;
- }
+ try {
+ hello.testProtectedSyncLocal();
+ pass = havePermission;
+ } catch(EJBAccessException e) {
+ pass = !havePermission;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
- try {
- hello.testUnprotectedSyncLocal();
- pass = true;
- } catch(Exception e) {
- pass = false;
- }
+ try {
+ hello.testUnprotectedSyncLocal();
+ pass = true;
+ } catch(Exception e) {
+ pass = false;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
- try {
- hello.testProtectedAsyncLocal();
- pass = havePermission;
- } catch(EJBAccessException e) {
- pass = !havePermission;
- }
+ try {
+ hello.testProtectedAsyncLocal();
+ pass = havePermission;
+ } catch(EJBAccessException e) {
+ pass = !havePermission;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
- try {
- hello.testUnprotectedAsyncLocal();
- pass = true;
- } catch(Exception e) {
- pass = false;
- }
+ try {
+ hello.testUnprotectedAsyncLocal();
+ pass = true;
+ } catch(Exception e) {
+ pass = false;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(NamingException ne) {
-
- if( appClient ) {
- stat.addStatus("local main", stat.FAIL);
- } else {
- System.out.println("Got expected security failure during lookup for non-authenticated SE client");
- stat.addStatus("local main", stat.PASS);
- }
+ } catch(NamingException ne) {
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ if( appClient ) {
+ stat.addStatus("local main", stat.FAIL);
+ } else {
+ System.out.println("Got expected security failure during lookup for non-authenticated SE client");
+ stat.addStatus("local main", stat.PASS);
+ }
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean.java
index 2cc7e66..aee2cef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean.java
@@ -31,21 +31,21 @@
@Resource
private FooManagedBean2 fmb2;
- @PostConstruct
+ @PostConstruct
private void init() {
System.out.println("In FooManagedBean::init()");
System.out.println("appName = " + appName);
fmb2.hello();
- }
+ }
public void hello() {
- System.out.println("In FooManagedBean::hello()");
+ System.out.println("In FooManagedBean::hello()");
}
-
+
@PreDestroy
- private void destroy() {
- System.out.println("In FooManagedBean::destroy()");
+ private void destroy() {
+ System.out.println("In FooManagedBean::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean2.java
index 2bc7f3b..8481129 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean2.java
@@ -28,26 +28,26 @@
String appName;
@Resource(name="java:module/env/fmbAppName", lookup="java:app/AppName")
- String appName2;
+ String appName2;
@Resource(lookup="java:module/env/fmbAppName")
- String appName3;
+ String appName3;
- @PostConstruct
+ @PostConstruct
private void init() {
System.out.println("In FooManagedBean2::init()");
System.out.println("appName = " + appName);
System.out.println("appName2 = " + appName2);
System.out.println("appName3 = " + appName3);
- }
+ }
public void hello() {
- System.out.println("In FooManagedBean2::hello()");
+ System.out.println("In FooManagedBean2::hello()");
}
@PreDestroy
- private void destroy() {
- System.out.println("In FooManagedBean2::destroy()");
+ private void destroy() {
+ System.out.println("In FooManagedBean2::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/application-client.xml
index 89bcee1..9b7eb4e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/application-client.xml
@@ -31,7 +31,7 @@
<env-entry>
<env-entry-name>envEntry3</env-entry-name>
<env-entry-type>java.lang.Integer</env-entry-type>
- <lookup-name>java:app/env/value1</lookup-name>
+ <lookup-name>java:app/env/value1</lookup-name>
</env-entry>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/ejb-jar.xml
index 8079fbd..4b4fbd7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/ejb-jar.xml
@@ -23,7 +23,7 @@
<enterprise-beans>
<session>
<ejb-name>SingletonBean</ejb-name>
-
+
<env-entry>
<env-entry-name>java:app/enventryforappclient</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/sun-ejb-jar.xml
index 1e958ab..ec2df51 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/sun-ejb-jar.xml
@@ -21,10 +21,10 @@
<sun-ejb-jar>
<security-role-mapping>
<role-name>foo</role-name>
- <principal-name>bob</principal-name>
+ <principal-name>bob</principal-name>
</security-role-mapping>
<security-role-mapping>
<role-name>bar</role-name>
- <principal-name>mary</principal-name>
+ <principal-name>mary</principal-name>
</security-role-mapping>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java
index 58d1488..7f1e43c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java
@@ -43,27 +43,27 @@
public void init() {
System.out.println("In SingletonBean::init()");
System.out.println("orb = " + orb);
- if( orb == null ) {
- throw new EJBException("null ORB");
- }
+ if( orb == null ) {
+ throw new EJBException("null ORB");
+ }
- Hello meViaAppClientDefinedDependency = (Hello)
- sessionCtx.lookup("java:app/env/appclientdefinedejbref1");
- System.out.println("meViaAppClientDefinedDependency =" +
- meViaAppClientDefinedDependency);
- Hello meViaAppClientDefinedDependency2 = (Hello)
- sessionCtx.lookup("java:app/appclientdefinedejbref2");
+ Hello meViaAppClientDefinedDependency = (Hello)
+ sessionCtx.lookup("java:app/env/appclientdefinedejbref1");
+ System.out.println("meViaAppClientDefinedDependency =" +
+ meViaAppClientDefinedDependency);
+ Hello meViaAppClientDefinedDependency2 = (Hello)
+ sessionCtx.lookup("java:app/appclientdefinedejbref2");
- Hello meViaAppClientDefinedDependency3 = (Hello)
- sessionCtx.lookup("java:global/appclientdefinedejbref3");
+ Hello meViaAppClientDefinedDependency3 = (Hello)
+ sessionCtx.lookup("java:global/appclientdefinedejbref3");
- String appLevelEnvEntry = (String)
- sessionCtx.lookup("java:app/env/enventry1");
- System.out.println("appLevelEnvEntry = " + appLevelEnvEntry);
+ String appLevelEnvEntry = (String)
+ sessionCtx.lookup("java:app/env/enventry1");
+ System.out.println("appLevelEnvEntry = " + appLevelEnvEntry);
- String globalLevelEnvEntry = (String)
- sessionCtx.lookup("java:global/enventry2");
- System.out.println("globalLevelEnvEntry = " + globalLevelEnvEntry);
+ String globalLevelEnvEntry = (String)
+ sessionCtx.lookup("java:global/enventry2");
+ System.out.println("globalLevelEnvEntry = " + globalLevelEnvEntry);
}
@@ -71,111 +71,111 @@
@RolesAllowed("foo")
public void protectedSyncRemote() {
- System.out.println("In SingletonBean::protectedSyncRemote cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
+ System.out.println("In SingletonBean::protectedSyncRemote cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
}
@PermitAll
public void unprotectedSyncRemote() {
- System.out.println("In SingletonBean::unprotectedSyncRemote cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
+ System.out.println("In SingletonBean::unprotectedSyncRemote cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
}
@RolesAllowed("foo")
@Asynchronous
public Future<Object> protectedAsyncRemote() {
- System.out.println("In SingletonBean::protectedAsyncRemote cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
- return new AsyncResult<Object>(new String());
+ System.out.println("In SingletonBean::protectedAsyncRemote cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
+ return new AsyncResult<Object>(new String());
}
@Asynchronous
@PermitAll
public Future<Object> unprotectedAsyncRemote() {
- System.out.println("In SingletonBean::unprotectedAsyncRemote cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
- return new AsyncResult<Object>(new String());
+ System.out.println("In SingletonBean::unprotectedAsyncRemote cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
+ return new AsyncResult<Object>(new String());
}
@RolesAllowed("foo")
@Asynchronous
public Future<Object> protectedAsyncLocal() {
- System.out.println("In SingletonBean::protectedAsyncLocal cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
- return new AsyncResult<Object>(new String());
+ System.out.println("In SingletonBean::protectedAsyncLocal cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
+ return new AsyncResult<Object>(new String());
}
@Asynchronous
@PermitAll
public Future<Object> unprotectedAsyncLocal() {
- System.out.println("In SingletonBean::unprotectedAsyncLocal cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
- return new AsyncResult<Object>(new String());
+ System.out.println("In SingletonBean::unprotectedAsyncLocal cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
+ return new AsyncResult<Object>(new String());
}
@RolesAllowed("foo")
public void protectedSyncLocal() {
- System.out.println("In SingletonBean::protectedSyncLocal cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
- return;
+ System.out.println("In SingletonBean::protectedSyncLocal cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
+ return;
}
-
+
@PermitAll
public void unprotectedSyncLocal() {
- System.out.println("In SingletonBean::unprotectedSyncLocal cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
- return ;
+ System.out.println("In SingletonBean::unprotectedSyncLocal cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
+ return ;
}
@PermitAll
public void testProtectedSyncLocal() {
- me.protectedSyncLocal();
+ me.protectedSyncLocal();
}
@PermitAll
public void testProtectedAsyncLocal() {
- try {
- Future<Object> future = me.protectedAsyncLocal();
- Object obj = future.get();
- } catch(Exception ee) {
- if( ee.getCause() instanceof EJBAccessException) {
- throw (EJBAccessException) ee.getCause();
- }
- }
+ try {
+ Future<Object> future = me.protectedAsyncLocal();
+ Object obj = future.get();
+ } catch(Exception ee) {
+ if( ee.getCause() instanceof EJBAccessException) {
+ throw (EJBAccessException) ee.getCause();
+ }
+ }
}
@PermitAll
public void testUnprotectedSyncLocal() {
- me.unprotectedSyncLocal();
+ me.unprotectedSyncLocal();
}
@PermitAll
public void testUnprotectedAsyncLocal() {
- try {
- Future<Object> future = me.unprotectedAsyncLocal();
- Object obj = future.get();
- // Success
- } catch(Exception ee) {
- throw (EJBException) new EJBException("Got unexpected exception").initCause(ee.getCause());
- }
+ try {
+ Future<Object> future = me.unprotectedAsyncLocal();
+ Object obj = future.get();
+ // Success
+ } catch(Exception ee) {
+ throw (EJBException) new EJBException("Got unexpected exception").initCause(ee.getCause());
}
-
+ }
+
@PreDestroy
public void destroy() {
System.out.println("In SingletonBean::destroy()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/build.xml
index 1f84f81..1c8dc7f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/build.xml
@@ -60,9 +60,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-singleton tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-singleton tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.properties
index 4f123f5..e3a550b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-singleton-cache"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.xml
index 33783d4..29a3c19 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Cache*.class,**/Singleton*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java
index 31ed837..42de21a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java
@@ -26,17 +26,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -44,27 +44,27 @@
public void doTest() {
- try {
+ try {
- CacheRemote cache = (CacheRemote) new InitialContext().lookup("java:global/" + appName + "/CacheBean!com.acme.CacheRemote");
+ CacheRemote cache = (CacheRemote) new InitialContext().lookup("java:global/" + appName + "/CacheBean!com.acme.CacheRemote");
- // sleep for a few second
- int sleep = 11;
- System.out.println("Waiting " + sleep + " seconds for cache refresh...");
- System.out.println("(Lower this value once minimum timeout is 1 sec)");
- Thread.sleep(sleep * 1000);
- System.out.println("Waking up from sleep. Now check cache");
-
- int numRefreshes = cache.checkCache();
-
- System.out.println("Num refreshes = " + numRefreshes);
+ // sleep for a few second
+ int sleep = 11;
+ System.out.println("Waiting " + sleep + " seconds for cache refresh...");
+ System.out.println("(Lower this value once minimum timeout is 1 sec)");
+ Thread.sleep(sleep * 1000);
+ System.out.println("Waking up from sleep. Now check cache");
- stat.addStatus("local main", stat.PASS);
+ int numRefreshes = cache.checkCache();
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ System.out.println("Num refreshes = " + numRefreshes);
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java
index d164b13..7f918ff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java
@@ -40,16 +40,16 @@
@PostConstruct
private void init() {
System.out.println("In Cache:init()");
- me = sesCtx.getBusinessObject(CacheBean.class);
- me.runAsync();
- try {
- System.out.println("Blocking 2 secs in init");
- Thread.sleep(1500);
- System.out.println("Waking up from sleep in init...");
- } catch(Exception e) {
- e.printStackTrace();
- }
- finishedInit = true;
+ me = sesCtx.getBusinessObject(CacheBean.class);
+ me.runAsync();
+ try {
+ System.out.println("Blocking 2 secs in init");
+ Thread.sleep(1500);
+ System.out.println("Waking up from sleep in init...");
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ finishedInit = true;
}
@Asynchronous
@@ -57,55 +57,55 @@
public int checkCache() {
- if( failure ) {
- throw new EJBException(failureMsg);
- }
+ if( failure ) {
+ throw new EJBException(failureMsg);
+ }
- int refreshes = refreshCount.intValue();
- if( refreshes == 0 ) {
- throw new EJBException("no refreshes");
- }
+ int refreshes = refreshCount.intValue();
+ if( refreshes == 0 ) {
+ throw new EJBException("no refreshes");
+ }
- System.out.println("Successful cache check total refreshes = " + refreshes);
- return refreshes;
+ System.out.println("Successful cache check total refreshes = " + refreshes);
+ return refreshes;
}
@Schedule(second="*/1", minute="*", hour="*", persistent=false)
private void refresh() {
- int count = refreshCount.incrementAndGet();
- System.out.println("In Cache:refresh() num refreshes = " + count);
+ int count = refreshCount.incrementAndGet();
+ System.out.println("In Cache:refresh() num refreshes = " + count);
}
@PreDestroy
private void destroy() {
- shutdown = true;
+ shutdown = true;
System.out.println("In Cache:destroy()");
}
@Asynchronous
public void runAsync() {
- if( !finishedInit ) {
- failure = true;
- failureMsg = "Async called before init finished";
- }
-
- System.out.println("In Singleton::run()");
-
- while(!shutdown) {
-
- try {
- System.out.println("Going to sleep...");
- Thread.sleep(5000);
- System.out.println("Waking up from sleep...");
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
-
- System.out.println("Exiting Cache::run() due to shutdown");
- return;
+ if( !finishedInit ) {
+ failure = true;
+ failureMsg = "Async called before init finished";
}
-
+
+ System.out.println("In Singleton::run()");
+
+ while(!shutdown) {
+
+ try {
+ System.out.println("Going to sleep...");
+ Thread.sleep(5000);
+ System.out.println("Waking up from sleep...");
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ System.out.println("Exiting Cache::run() due to shutdown");
+ return;
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.properties
index f729454..573ef2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-singleton-hello"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.xml
index b72a40f..1a8433e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,24 +46,24 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Foo*.class,**/Singleton*.class,**/Hello*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="startDerby"/>
<sleep minutes="2"/>
- <antcall target="deploy-jar-common"/>
+ <antcall target="deploy-jar-common"/>
</target>
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
<antcall target="stopDerby"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
index c68e043..fceb402 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
@@ -29,17 +29,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -47,37 +47,37 @@
public void doTest() {
- try {
+ try {
- // Ensure that MEJB is registered under all three of its JNDI names
- System.out.println("Looking up MEJB Homes");
- ManagementHome mh1Obj = (ManagementHome) new InitialContext().lookup("ejb/mgmt/MEJB");
- ManagementHome mh2Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
- ManagementHome mh3Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean!javax.management.j2ee.ManagementHome");
+ // Ensure that MEJB is registered under all three of its JNDI names
+ System.out.println("Looking up MEJB Homes");
+ ManagementHome mh1Obj = (ManagementHome) new InitialContext().lookup("ejb/mgmt/MEJB");
+ ManagementHome mh2Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
+ ManagementHome mh3Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean!javax.management.j2ee.ManagementHome");
- System.out.println("mejb home obj 1 = " + mh1Obj);
- System.out.println("mejb home obj 2 = " + mh2Obj);
- System.out.println("mejb home obj 3 = " + mh3Obj);
+ System.out.println("mejb home obj 1 = " + mh1Obj);
+ System.out.println("mejb home obj 2 = " + mh2Obj);
+ System.out.println("mejb home obj 3 = " + mh3Obj);
- Hello hello = (Hello) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+ Hello hello = (Hello) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
- System.out.println("Singleton says : " + hello.hello());
+ System.out.println("Singleton says : " + hello.hello());
hello.async();
- try {
- hello.test_Err_or("foo", "bar");
- throw new RuntimeException("Expected EJBException");
- } catch(EJBException e) {
- System.out.println("Got expected EJBException after java.lang.Error thrown from ejb");
- }
+ try {
+ hello.test_Err_or("foo", "bar");
+ throw new RuntimeException("Expected EJBException");
+ } catch(EJBException e) {
+ System.out.println("Got expected EJBException after java.lang.Error thrown from ejb");
+ }
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client2.java
index 9bb87ef..830ce33 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client2.java
@@ -23,29 +23,29 @@
public static void main(String args[]) {
- String host;
- String port;
+ String host;
+ String port;
- try {
- Properties p = new Properties();
- if( args.length > 0 ) {
- host = args[0];
- p.put("org.omg.CORBA.ORBInitialHost", host);
- }
+ try {
+ Properties p = new Properties();
+ if( args.length > 0 ) {
+ host = args[0];
+ p.put("org.omg.CORBA.ORBInitialHost", host);
+ }
- if( args.length > 1 ) {
- port = args[1];
- p.put("org.omg.CORBA.ORBInitialPort", port);
- }
+ if( args.length > 1 ) {
+ port = args[1];
+ p.put("org.omg.CORBA.ORBInitialPort", port);
+ }
- InitialContext ic = new InitialContext(p);
- Hello h = (Hello) ic.lookup("HH#com.acme.Hello");
- h.hello();
+ InitialContext ic = new InitialContext(p);
+ Hello h = (Hello) ic.lookup("HH#com.acme.Hello");
+ h.hello();
- } catch(Exception e) {
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/FooEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/FooEntity.java
index 2bdd2ab..8f44c96 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/FooEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/FooEntity.java
@@ -24,8 +24,8 @@
@Entity
public class FooEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -33,10 +33,10 @@
public FooEntity(String name) {
setName(name);
}
-
+
public FooEntity() {
}
-
+
public String getName() {
return name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
index 61b72f1..c23f7cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
@@ -54,7 +54,7 @@
ManagementHome mHome2;
*/
-
+
//MEJBHome mHome2;
@@ -63,30 +63,30 @@
public void init() {
System.out.println("In SingletonBean::init()");
System.out.println("orb = " + orb);
- if( orb == null ) {
- throw new EJBException("null ORB");
- }
- try {
- // same problem ManagementHome mHomeL = (ManagementHome) new InitialContext().lookup("java:comp/env/mejb");
- // same problem ManagementHome mHomeL2 = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
- // System.out.println("mHomeL = " + mHomeL);
- // System.out.println("mHomeL2 = " + mHomeL2);
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ if( orb == null ) {
+ throw new EJBException("null ORB");
+ }
+ try {
+ // same problem ManagementHome mHomeL = (ManagementHome) new InitialContext().lookup("java:comp/env/mejb");
+ // same problem ManagementHome mHomeL2 = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
+ // System.out.println("mHomeL = " + mHomeL);
+ // System.out.println("mHomeL2 = " + mHomeL2);
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
- // System.out.println("mHome1 = " + mHome1);
- // System.out.println("mHome2 = " + mHome2);
+ // System.out.println("mHome1 = " + mHome1);
+ // System.out.println("mHome2 = " + mHome2);
}
-
+
public String hello() {
- System.out.println("In SingletonBean::hello()");
- return "hello, world!\n";
+ System.out.println("In SingletonBean::hello()");
+ return "hello, world!\n";
}
public void test_Err_or(String s1, String s2) {
- throw new Error("test java.lang.Error");
+ throw new Error("test java.lang.Error");
}
@Asynchronous
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.properties
index dddab6e..8cfaf68 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-singleton-multimodule"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/>\u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.sun.devtest.client.Client"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.xml
index e851c5a..07d3188 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.xml
@@ -30,14 +30,14 @@
&testproperties;
<target name="all" depends="build,deploy">
- <antcall target="run"/>
- <antcall target="undeploy-common"/>
+ <antcall target="run"/>
+ <antcall target="undeploy-common"/>
</target>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,77 +49,77 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
- <echo message="Assemble dir: ${assemble.dir} "/>
+ <echo message="Assemble dir: ${assemble.dir} "/>
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Tracker.class, **/InitOrderTrackerBean.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Mod1.class, **/LocalInitTracker.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Mod2.class, **/LocalInitTracker.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-client.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-client.jar"
+ basedir="${build.classes.dir}"
update="true"
- manifest="./client/MANIFEST.MF"
+ manifest="./client/MANIFEST.MF"
includes ="**/*Tracker.class, **/*Client.class">
</jar>
<!--
<antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
- value="${build.classes.dir}"/>
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>/space/work/v3/appserv-tests/build/module/archive/ejb-ejb31-singleton-multimodule-ejb.jar
+ <param name="appclientjar.files"
+ value="${build.classes.dir}"/>
+ <param name="appclient.jar"
+ value="${assemble.dir}/${appname}-client.jar"/>/space/work/v3/appserv-tests/build/module/archive/ejb-ejb31-singleton-multimodule-ejb.jar
</antcall>
-->
- <delete file="${assemble.dir}/${appname}.ear"/>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
- <fileset dir="${assemble.dir}">
- <include name="*ejb.jar"/>
- <include name="*ejb1.jar"/>
- <include name="*ejb2.jar"/>
- <include name="*client.jar"/>
- </fileset>
- <fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
- <include name="META-INF/application.xml"/>
- </fileset>
- <fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
- </jar>
+ <delete file="${assemble.dir}/${appname}.ear"/>
+ <mkdir dir="${assemble.dir}"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <fileset dir="${assemble.dir}">
+ <include name="*ejb.jar"/>
+ <include name="*ejb1.jar"/>
+ <include name="*ejb2.jar"/>
+ <include name="*client.jar"/>
+ </fileset>
+ <fileset dir="${build.classes.dir}">
+ <include name="META-INF/sun-application.xml"/>
+ <include name="META-INF/application.xml"/>
+ </fileset>
+ <fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
+ </jar>
- </target>
-
+ </target>
+
<target name="deploy" depends="build">
<property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
<arg line="--force=true"/>
- <arg line="${as.props}"/>
+ <arg line="${as.props}"/>
<arg line="${deployed.app}"/>
</exec>
<echo message="Deployment on target server ${appserver.instance.name} successful"/>
-
- </target>
+
+ </target>
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="se.client: ${se.client}"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java
index e460cbf..5646995 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java
@@ -31,23 +31,23 @@
public class Client {
- private static String[] BEAN_NAMES = new String[] {
- "org.glassfish.devtest.ejb31.singleton.multimodule.servlet.InitOrderTrackerBean",
- "org.glassfish.devtest.ejb31.singleton.multimodule.mod1.BeanA_Mod1",
- "org.glassfish.devtest.ejb31.singleton.multimodule.mod1.RootBean_Mod1",
- "org.glassfish.devtest.ejb31.singleton.multimodule.mod2.BeanA_Mod2",
- "org.glassfish.devtest.ejb31.singleton.multimodule.mod2.RootBean_Mod2"
- };
+ private static String[] BEAN_NAMES = new String[] {
+ "org.glassfish.devtest.ejb31.singleton.multimodule.servlet.InitOrderTrackerBean",
+ "org.glassfish.devtest.ejb31.singleton.multimodule.mod1.BeanA_Mod1",
+ "org.glassfish.devtest.ejb31.singleton.multimodule.mod1.RootBean_Mod1",
+ "org.glassfish.devtest.ejb31.singleton.multimodule.mod2.BeanA_Mod2",
+ "org.glassfish.devtest.ejb31.singleton.multimodule.mod2.RootBean_Mod2"
+ };
- private static final String INIT_ORDER_BEAN = BEAN_NAMES[0];
+ private static final String INIT_ORDER_BEAN = BEAN_NAMES[0];
- private static final String BEAN_MOD1 = BEAN_NAMES[1];
+ private static final String BEAN_MOD1 = BEAN_NAMES[1];
- private static final String ROOT1 = BEAN_NAMES[2];
+ private static final String ROOT1 = BEAN_NAMES[2];
- private static final String BEAN_MOD2 = BEAN_NAMES[3];
+ private static final String BEAN_MOD2 = BEAN_NAMES[3];
- private static final String ROOT2 = BEAN_NAMES[4];
+ private static final String ROOT2 = BEAN_NAMES[4];
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -65,37 +65,37 @@
}
private void test() {
- try {
-
- String lookupName = "java:global/ejb-ejb31-singleton-multimoduleApp/ejb-ejb31-singleton-multimodule-ejb/InitOrderTrackerBean!org.glassfish.devtest.ejb31.singleton.multimodule.servlet.RemoteInitTracker";
- System.out.println("*****************************************************");
- System.out.println("*** " + lookupName + " ***");
- System.out.println("*****************************************************");
- tracker = (RemoteInitTracker) new InitialContext().lookup(lookupName);
-
- Map<String, Integer> initOrder = tracker.getInitializedNames();
- boolean result = initOrder.size() == BEAN_NAMES.length;
+ try {
- int b1m1 = initOrder.get(BEAN_MOD1);
- int b2m2 = initOrder.get(BEAN_MOD2);
- int root1 = initOrder.get(ROOT1);
- int root2 = initOrder.get(ROOT2);
+ String lookupName = "java:global/ejb-ejb31-singleton-multimoduleApp/ejb-ejb31-singleton-multimodule-ejb/InitOrderTrackerBean!org.glassfish.devtest.ejb31.singleton.multimodule.servlet.RemoteInitTracker";
+ System.out.println("*****************************************************");
+ System.out.println("*** " + lookupName + " ***");
+ System.out.println("*****************************************************");
+ tracker = (RemoteInitTracker) new InitialContext().lookup(lookupName);
- boolean test1 = b1m1 < root1;
- boolean test2 = root1 < root2;
- boolean test3 = b2m2 < root2;
- for (String key : initOrder.keySet()) {
- System.out.println(key + ": " + initOrder.get(key));
- }
+ Map<String, Integer> initOrder = tracker.getInitializedNames();
+ boolean result = initOrder.size() == BEAN_NAMES.length;
- result = result && test1 && test2 && test3;
+ int b1m1 = initOrder.get(BEAN_MOD1);
+ int b2m2 = initOrder.get(BEAN_MOD2);
+ int root1 = initOrder.get(ROOT1);
+ int root2 = initOrder.get(ROOT2);
- stat.addStatus("EJB singleton-cross-module-dependency",
- (result ? stat.PASS : stat.FAIL));
- } catch (Throwable th) {
- th.printStackTrace();
- stat.addStatus("EJB singleton-cross-module-dependency", stat.FAIL);
- }
+ boolean test1 = b1m1 < root1;
+ boolean test2 = root1 < root2;
+ boolean test3 = b2m2 < root2;
+ for (String key : initOrder.keySet()) {
+ System.out.println(key + ": " + initOrder.get(key));
+ }
+
+ result = result && test1 && test2 && test3;
+
+ stat.addStatus("EJB singleton-cross-module-dependency",
+ (result ? stat.PASS : stat.FAIL));
+ } catch (Throwable th) {
+ th.printStackTrace();
+ stat.addStatus("EJB singleton-cross-module-dependency", stat.FAIL);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
index f10b62f..899bdd3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
@@ -46,5 +46,5 @@
public void afterInit() {
tracker.add(this.getClass().getName());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
index b96868f..a8e8010 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
@@ -37,10 +37,10 @@
@EJB
LocalInitTracker tracker;
-
+
@PostConstruct
public void afterInit() {
tracker.add(this.getClass().getName());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
index a9738b1..2c9808e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
@@ -47,5 +47,5 @@
public void afterInit() {
tracker.add(this.getClass().getName());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
index dd49b4d..cf306eb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
@@ -22,7 +22,7 @@
@Local
public interface LocalInitTracker {
-
+
public void add(String entry);
public Map<String, Integer> getInitializedNames();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.properties
index 971e12f..c9841de 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-singleton-threemodules"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/>\u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.sun.devtest.client.Client"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.xml
index ba787e5..e9423ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.xml
@@ -30,14 +30,14 @@
&testproperties;
<target name="all" depends="build,deploy">
- <antcall target="run"/>
- <antcall target="undeploy-common"/>
+ <antcall target="run"/>
+ <antcall target="undeploy-common"/>
</target>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,77 +49,77 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
- <echo message="Assemble dir: ${assemble.dir} "/>
+ <echo message="Assemble dir: ${assemble.dir} "/>
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Tracker.class, **/InitOrderTrackerBean.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Mod1.class, **/LocalInitTracker.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Mod2.class, **/LocalInitTracker.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-client.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-client.jar"
+ basedir="${build.classes.dir}"
update="true"
- manifest="./client/MANIFEST.MF"
+ manifest="./client/MANIFEST.MF"
includes ="**/*Tracker.class, **/*Client.class">
</jar>
<!--
<antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
- value="${build.classes.dir}"/>
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>/space/work/v3/appserv-tests/build/module/archive/ejb-ejb31-singleton-threemodules-ejb.jar
+ <param name="appclientjar.files"
+ value="${build.classes.dir}"/>
+ <param name="appclient.jar"
+ value="${assemble.dir}/${appname}-client.jar"/>/space/work/v3/appserv-tests/build/module/archive/ejb-ejb31-singleton-threemodules-ejb.jar
</antcall>
-->
- <delete file="${assemble.dir}/${appname}.ear"/>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
- <fileset dir="${assemble.dir}">
- <include name="*ejb.jar"/>
- <include name="*ejb1.jar"/>
- <include name="*ejb2.jar"/>
- <include name="*client.jar"/>
- </fileset>
- <fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
- <include name="META-INF/application.xml"/>
- </fileset>
- <fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
- </jar>
+ <delete file="${assemble.dir}/${appname}.ear"/>
+ <mkdir dir="${assemble.dir}"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <fileset dir="${assemble.dir}">
+ <include name="*ejb.jar"/>
+ <include name="*ejb1.jar"/>
+ <include name="*ejb2.jar"/>
+ <include name="*client.jar"/>
+ </fileset>
+ <fileset dir="${build.classes.dir}">
+ <include name="META-INF/sun-application.xml"/>
+ <include name="META-INF/application.xml"/>
+ </fileset>
+ <fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
+ </jar>
- </target>
-
+ </target>
+
<target name="deploy" depends="build">
<property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
<arg line="--force=true"/>
- <arg line="${as.props}"/>
+ <arg line="${as.props}"/>
<arg line="${deployed.app}"/>
</exec>
<echo message="Deployment on target server ${appserver.instance.name} successful"/>
-
- </target>
+
+ </target>
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="se.client: ${se.client}"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java
index aeb38c4..ad88800 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java
@@ -33,13 +33,13 @@
public class Client {
- private static String[] EXPECTED_ORDER = new String[] {
- "org.glassfish.devtest.ejb31.singleton.servlet.InitOrderTrackerBean",
- "org.glassfish.devtest.ejb31.singleton.mod1.BeanA_Mod1",
- "org.glassfish.devtest.ejb31.singleton.mod1.RootBean_Mod1",
- "org.glassfish.devtest.ejb31.singleton.mod2.BeanA_Mod2",
- "org.glassfish.devtest.ejb31.singleton.mod2.RootBean_Mod2"
- };
+ private static String[] EXPECTED_ORDER = new String[] {
+ "org.glassfish.devtest.ejb31.singleton.servlet.InitOrderTrackerBean",
+ "org.glassfish.devtest.ejb31.singleton.mod1.BeanA_Mod1",
+ "org.glassfish.devtest.ejb31.singleton.mod1.RootBean_Mod1",
+ "org.glassfish.devtest.ejb31.singleton.mod2.BeanA_Mod2",
+ "org.glassfish.devtest.ejb31.singleton.mod2.RootBean_Mod2"
+ };
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -57,28 +57,28 @@
}
private void test() {
- try {
-
- String lookupName = "java:global/ejb-ejb31-singleton-threemodulesApp/ejb-ejb31-singleton-threemodules-ejb/InitOrderTrackerBean!org.glassfish.devtest.ejb31.singleton.servlet.RemoteInitTracker";
- System.out.println("*****************************************************");
- System.out.println("*** " + lookupName + " ***");
- System.out.println("*****************************************************");
- tracker = (RemoteInitTracker) new InitialContext().lookup(lookupName);
-
- List<String> actualList = tracker.getInitializedNames();
- boolean result = actualList.size() == EXPECTED_ORDER.length;
- for (int i=0; i<EXPECTED_ORDER.length; i++) {
- if (! EXPECTED_ORDER[i].equals(actualList.get(i))) {
- result = false;
- }
- }
+ try {
+
+ String lookupName = "java:global/ejb-ejb31-singleton-threemodulesApp/ejb-ejb31-singleton-threemodules-ejb/InitOrderTrackerBean!org.glassfish.devtest.ejb31.singleton.servlet.RemoteInitTracker";
+ System.out.println("*****************************************************");
+ System.out.println("*** " + lookupName + " ***");
+ System.out.println("*****************************************************");
+ tracker = (RemoteInitTracker) new InitialContext().lookup(lookupName);
+
+ List<String> actualList = tracker.getInitializedNames();
+ boolean result = actualList.size() == EXPECTED_ORDER.length;
+ for (int i=0; i<EXPECTED_ORDER.length; i++) {
+ if (! EXPECTED_ORDER[i].equals(actualList.get(i))) {
+ result = false;
+ }
+ }
System.out.println(actualList);
- stat.addStatus("EJB singleton-three-module-dependency",
- (result ? stat.PASS : stat.FAIL));
- } catch (Throwable th) {
- th.printStackTrace();
- stat.addStatus("EJB singleton-three-module-dependency", stat.FAIL);
- }
+ stat.addStatus("EJB singleton-three-module-dependency",
+ (result ? stat.PASS : stat.FAIL));
+ } catch (Throwable th) {
+ th.printStackTrace();
+ stat.addStatus("EJB singleton-three-module-dependency", stat.FAIL);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
index 1fdc8e0..681d041 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
@@ -46,5 +46,5 @@
public void afterInit() {
tracker.add(this.getClass().getName());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
index 2b60295..3909cc4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
@@ -37,10 +37,10 @@
@EJB
LocalInitTracker tracker;
-
+
@PostConstruct
public void afterInit() {
tracker.add(this.getClass().getName());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
index 900d211..67787ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
@@ -47,5 +47,5 @@
public void afterInit() {
tracker.add(this.getClass().getName());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
index a2ccdd8..d41bd0c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
@@ -22,7 +22,7 @@
@Local
public interface LocalInitTracker {
-
+
public void add(String entry);
public List getInitializedNames();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.properties
index eccf2e7..ed7bef0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-aroundtimeout"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb31.aroundtimeout.client.StandaloneClient"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.xml
index b130fa7..aa9b030 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class,**/Common*.class,**/Interceptor*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sless.class,**/Sful2.class,**/Sless3.class,**/Sless4.class,**/Sless5.class,**/Sless6.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java
index 8b7e34f..48caac5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) throws Exception {
@@ -36,11 +36,11 @@
Thread.sleep(7000);
client.doTest();
stat.printSummary("ejb-ejb31-aroundtimeoutID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB Sless3 sless3;
private static @EJB Sless4 sless4;
private static @EJB Sless5 sless5;
@@ -81,8 +81,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
index b6eb3a7..faf2a1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
@@ -36,16 +36,16 @@
static void aroundTimeoutCalled(InvocationContext ctx, String id) {
- List<String> aroundtimeout = (List<String>)
+ List<String> aroundtimeout = (List<String>)
ctx.getContextData().get(INTERCEPTORS_PROP);
-
+
if( aroundtimeout == null ) {
aroundtimeout = new LinkedList<String>();
ctx.getContextData().put(INTERCEPTORS_PROP, aroundtimeout);
}
aroundtimeout.add(id);
-
+
}
static void checkResults(InvocationContext ctx) {
@@ -82,9 +82,9 @@
for( char nextChar : methodNameUpper.toCharArray() ) {
expected.add(nextChar + "");
}
- }
+ }
- List<String> actual = (List<String>)
+ List<String> actual = (List<String>)
ctx.getContextData().get(INTERCEPTORS_PROP);
String msg = "Expected " + expected + " for method " +
@@ -101,7 +101,7 @@
}
calls.add(info);
}
-
+
static void checkResults(String s0, int expected) {
List<String> results = new ArrayList<String>();
for (String s : calls) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
index 699640b..ccebf5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
@@ -26,7 +26,7 @@
public class InterceptorA {
@Resource SessionContext sessionCtx;
-
+
@PostConstruct
private void postConstruct(InvocationContext ctx) {
try {
@@ -38,7 +38,7 @@
@AroundTimeout
Object aroundTimeout(InvocationContext ctx)
- throws Exception {
+ throws Exception {
/**
// access injected environment dependency
@@ -49,10 +49,10 @@
// look up ejb-ref defined within default interceptor in ejb-jar.xml
InitialContext ic = new InitialContext();
Sless3 sless3 = (Sless3) ic.lookup("java:comp/env/ejb/Sless3");
-
-
+
+
Common.aroundTimeoutCalled(ctx, "A");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorB.java
index 741452d..69093e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorB.java
@@ -32,9 +32,9 @@
// around-timeout declared in ejb-jar.xml
Object aroundTimeout(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundTimeoutCalled(ctx, "B");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorC.java
index d015b9b..82f8e46 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorC.java
@@ -33,9 +33,9 @@
@AroundTimeout
Object aroundTimeout(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundTimeoutCalled(ctx, "C");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorD.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorD.java
index 104ef8e..73f2120 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorD.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorD.java
@@ -35,7 +35,7 @@
@AroundTimeout
@AroundInvoke
Object aroundAll(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundTimeoutCalled(ctx, "D");
Object instance = ctx.getTarget();
if( instance instanceof SlessEJB5 ) {
@@ -44,5 +44,5 @@
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorE.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorE.java
index 56cb0cf..aa3d5b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorE.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorE.java
@@ -33,9 +33,9 @@
@AroundTimeout
Object aroundTimeout(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundTimeoutCalled(ctx, "E");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorF.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorF.java
index 34c91ab..ea4b892 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorF.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorF.java
@@ -33,9 +33,9 @@
@AroundTimeout
Object aroundTimeout(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundTimeoutCalled(ctx, "F");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorG.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorG.java
index c747fc1..4f35af9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorG.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorG.java
@@ -34,7 +34,7 @@
@AroundTimeout
Object aroundTimeout(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundTimeoutCalled(ctx, "G");
Object instance = ctx.getTarget();
if( instance instanceof SlessEJB6 ) {
@@ -43,10 +43,10 @@
}
return ctx.proceed();
}
-
+
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Object instance = ctx.getTarget();
if( instance instanceof SlessEJB6 ) {
((SlessEJB6) instance).aroundTimeoutCalled = false;
@@ -54,5 +54,5 @@
}
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java
index cfc4e10..af61cb5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless3
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java
index 5b56aa6..14a961a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless4
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java
index 4fcb31e..c233296 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless5
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java
index 77f94db..0eaa459 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless6
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
index 018cf92..a2f0d51 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
@@ -61,18 +61,18 @@
@Interceptors({InterceptorE.class, InterceptorF.class})
@Schedule(second="*", minute="*", hour="*", info="SlessEJB3-dcef")
private void dcef() {}
-
+
@ExcludeDefaultInterceptors
@ExcludeClassInterceptors
@Schedule(second="*", minute="*", hour="*", info="SlessEJB3-nothing")
private void nothing() {}
- @Interceptors({InterceptorE.class, InterceptorF.class})
+ @Interceptors({InterceptorE.class, InterceptorF.class})
@Schedule(second="*", minute="*", hour="*", info="SlessEJB3-dcbaef")
private void dcbaef() {}
// total ordering overridden in deployment descriptor
- @Interceptors({InterceptorE.class, InterceptorF.class})
+ @Interceptors({InterceptorE.class, InterceptorF.class})
@Schedule(second="*", minute="*", hour="*", info="SlessEJB3-abcdef")
private void abcdef() {}
@@ -91,7 +91,7 @@
Common.checkResults(ctx);
return null;
}
-
+
@AroundInvoke
private Object aroundInvoke(InvocationContext ctx) throws Exception
{
@@ -101,7 +101,7 @@
}
return ctx.proceed();
}
-
+
public void verify() {
Common.checkResults("SlessEJB3", EXPECTED);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
index 812be99..39fbdee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
@@ -45,7 +45,7 @@
// aroundTimeout should be still false, and exception is expected.
@Schedule(second="*", minute="*", hour="*", info="SlessEJB4-cbd")
public void cbd() {
- System.out.println("in SlessEJB4:cbd(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB4:cbd(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
// a little extra checking to make sure aroundTimeout is invoked...
@@ -68,13 +68,13 @@
@Schedule(second="*", minute="*", hour="*", info="SlessEJB4-abef")
public void abef(Timer t) {}
- // @ExcludeDefaultInterceptors is a no-op here since it
+ // @ExcludeDefaultInterceptors is a no-op here since it
// was already excluded at class-level
@ExcludeDefaultInterceptors
@Interceptors({InterceptorE.class, InterceptorF.class})
@Schedule(second="*", minute="*", hour="*", info="SlessEJB4-cbdef")
public void cbdef() {}
-
+
@ExcludeClassInterceptors
@Schedule(second="*", minute="*", hour="*", info="SlessEJB4-nothing")
public void nothing() {}
@@ -91,7 +91,7 @@
throw new EJBException(e);
}
}
-
+
public void verify() {
Common.checkResults("SlessEJB4", EXPECTED);
Collection<Timer> timers = timerSvc.getTimers();
@@ -100,5 +100,5 @@
aroundTimeoutCalled = false;
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
index ebda1ba..81e844c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
@@ -40,18 +40,18 @@
private final static int EXPECTED = 3;
- // Called as a timeout and through interface. InderceptorD will
+ // Called as a timeout and through interface. InderceptorD will
// set aroundAllCalled to true either way.
@Schedule(second="*", minute="*", hour="*", info="SlessEJB5-abdc")
public void abdc() {
- System.out.println("in SlessEJB5:abdc(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB5:abdc(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
// a little extra checking to make sure AroundTimeout is invoked...
if( !aroundTimeoutCalled ) {
throw new EJBException("bean class aroundTimeout not called");
}
- // Enough if it is set once to true. Otherwise a timer can be executed
+ // Enough if it is set once to true. Otherwise a timer can be executed
// between verify() and direct call to this method through the interface
// aroundTimeoutCalled = false;
@@ -84,11 +84,11 @@
throw new EJBException(e);
}
}
-
+
public void verify() {
Common.checkResults("SlessEJB5", EXPECTED);
aroundTimeoutCalled = true;
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
index b62a976..69bf805 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
@@ -44,9 +44,9 @@
// Called as a timeout only. InterceptorG has 2 separate aroundXXX calls.
@Interceptors({InterceptorA.class, InterceptorG.class})
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-ag")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-ag")
public void ag() {
- System.out.println("in SlessEJB6:ag(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:ag(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( !aroundTimeoutCalled ) {
@@ -60,11 +60,11 @@
Common.storeResult("SlessEJB6-ag");
}
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-ag")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-ag")
public void ag(Timer t) {
System.out.println("in SlessEJB6:ag(Timer t). " +
"aroundTimeoutCalled = " + aroundTimeoutCalled);
-
+
if( aroundTimeoutCalled ) {
aroundTimeoutCalled = false;
throw new EJBException("bean class aroundTimeout was incorrectly called");
@@ -76,11 +76,11 @@
Common.storeResult("SlessEJB6_Timer-ag");
}
- // bg() (but not bg(param)) marked through ejb-jar.xml
+ // bg() (but not bg(param)) marked through ejb-jar.xml
// as having aroundtimeout B,G
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-bg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-bg")
public void bg() {
- System.out.println("in SlessEJB6:bg(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:bg(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( !aroundTimeoutCalled ) {
@@ -94,11 +94,11 @@
Common.storeResult("SlessEJB6-bg");
}
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-bg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-bg")
public void bg(Timer t) {
System.out.println("in SlessEJB6:bg(Timer t). " +
"aroundTimeoutCalled = " + aroundTimeoutCalled);
-
+
if( aroundTimeoutCalled ) {
aroundTimeoutCalled = false;
throw new EJBException("bean class aroundTimeout was incorrectly called");
@@ -112,9 +112,9 @@
// overloaded version of interceptor-binding used in ejb-jar.xml to
// mark all methods with name cg as having aroundtimeout C,G
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-cg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-cg")
public void cg() {
- System.out.println("in SlessEJB6:cg(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:cg(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( !aroundTimeoutCalled ) {
@@ -128,9 +128,9 @@
Common.storeResult("SlessEJB6-cg");
}
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-cg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-cg")
public void cg(Timer t) {
- System.out.println("in SlessEJB6:cg(Timer t). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:cg(Timer t). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( !aroundTimeoutCalled ) {
@@ -144,12 +144,12 @@
Common.storeResult("SlessEJB6_Timer-cg");
}
- // Kind of like ag(), in that dg() is overloaded, but it's the
+ // Kind of like ag(), in that dg() is overloaded, but it's the
// signature that has a parameter that is assigned aroundtimeout using
// @Interceptor.
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-dg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-dg")
public void dg() {
- System.out.println("in SlessEJB6:dg(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:dg(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( aroundTimeoutCalled ) {
@@ -164,11 +164,11 @@
}
@Interceptors({InterceptorD.class, InterceptorG.class})
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-dg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-dg")
public void dg(Timer t) {
System.out.println("in SlessEJB6:dg(Timer t). " +
"aroundTimeoutCalled = " + aroundTimeoutCalled);
-
+
if( !aroundTimeoutCalled ) {
throw new EJBException("bean class aroundTimeout not called");
}
@@ -184,9 +184,9 @@
// Like dg(), except that dg(Timer t) is assigned its interceptor
// chain through ejb-jar.xml
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-eg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-eg")
public void eg() {
- System.out.println("in SlessEJB6:eg(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:eg(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( aroundTimeoutCalled ) {
@@ -204,7 +204,7 @@
// 2 separate aroundXXX calls.
@Interceptors({InterceptorA.class, InterceptorG.class})
public void noaroundtimeout() {
- System.out.println("in SlessEJB6:noaroundtimeout(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:noaroundtimeout(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( aroundTimeoutCalled ) {
@@ -217,11 +217,11 @@
aroundInvokeCalled = false;
}
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-eg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-eg")
public void eg(Timer t) {
System.out.println("in SlessEJB6:eg(Timer t). " +
"aroundTimeoutCalled = " + aroundTimeoutCalled);
-
+
if( !aroundTimeoutCalled ) {
throw new EJBException("bean class aroundTimeout not called");
}
@@ -239,5 +239,5 @@
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
index 87b5107..264b8a9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
@@ -31,7 +31,7 @@
@Stateless
@ExcludeDefaultInterceptors
@Interceptors({InterceptorD.class, InterceptorC.class})
-public class SlessEJB7
+public class SlessEJB7
{
private final static int EXPECTED = 1;
@@ -52,7 +52,7 @@
Common.storeResult("SlessEJB7-dc");
return null;
}
-
+
@AroundInvoke
private Object aroundInvoke(InvocationContext ctx) throws Exception
{
@@ -61,7 +61,7 @@
return ctx.proceed();
}
-
+
public void verify() {
Common.checkResults("SlessEJB7", EXPECTED);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/build.xml
index cd41c10..49352a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/build.xml
@@ -90,17 +90,17 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-timer tests)
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-timer tests)
- ant nonpersistenttimer (Executes the non-persistent ejb-timer test)
- ant schedule_exp (Executes the schedule_exp ejb-timer test)
- ant schedule_ann (Executes the schedule_ann ejb-timer test)
- ant schedule_on_ejb_timeout (Executes the schedule_on_ejb_timeout ejb-timer test)
- ant aroundtimeout (Executes the aroundtimeout ejb-timer test)
- ant mdb (Executes the mdb ejb-timer test)
+ ant nonpersistenttimer (Executes the non-persistent ejb-timer test)
+ ant schedule_exp (Executes the schedule_exp ejb-timer test)
+ ant schedule_ann (Executes the schedule_ann ejb-timer test)
+ ant schedule_on_ejb_timeout (Executes the schedule_on_ejb_timeout ejb-timer test)
+ ant aroundtimeout (Executes the aroundtimeout ejb-timer test)
+ ant mdb (Executes the mdb ejb-timer test)
- </echo>
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.properties
index bf38417..70c969d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.properties
@@ -15,15 +15,15 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-keepstate"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.xml
index cf23989..4e0bb80 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,8 +49,8 @@
<param name="ejbjar.classes" value="**/KeepState*.class" />
<param name="appclientjar.classes" value="**/Client.class,**/KeepStateIF.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="First time deploy succeeded." />
@@ -90,10 +90,10 @@
value="--force=true --keepstate=${keepstate} --retrieve ${assemble.dir} ${assemble.dir}/${appname}App.ear "/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java
index b1d85fe..bd797b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java
@@ -26,7 +26,7 @@
@EJB private static KeepStateIF bean;
- public static void main(String args[]) {
+ public static void main(String args[]) {
boolean keepState = Boolean.valueOf(args[0]);
String testName = "ejb31-timer-keepstate-" + keepState;
stat.addDescription(testName);
@@ -41,7 +41,7 @@
}
public static void testKeepState(boolean keepState) throws Exception {
- String result = bean.verifyTimers(keepState);
+ String result = bean.verifyTimers(keepState);
System.out.println("testKeepStateTrue result: " + result);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java
index 0a0a08a..922a114 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java
@@ -23,9 +23,9 @@
@Singleton
public class KeepStateBean implements KeepStateIF {
private List<String> infos = new ArrayList<String>();
-
+
/**
- * keepstate is passed from build.xml to appclient as application args, and to this
+ * keepstate is passed from build.xml to appclient as application args, and to this
* business method. The test EAR app is deployed once first, then KeepStateIF.INFO
* is modified, rebuild, and redeployed. If redeployed with keepstate true, no new
* auto timers are created, and existing timers are carried over. So these timers
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.properties
index 293480d..44f14c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-timer31-mdb"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.xml
index dab2b413..b6413bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Interceptor*.class,**/Singleton*.class,**/MessageBean.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,16 +65,16 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -85,7 +85,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java
index 7c6869e..71efffb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java
@@ -26,17 +26,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -44,29 +44,29 @@
public void doTest() {
- try {
+ try {
- SingletonRemote singleton = (SingletonRemote) new InitialContext().lookup("java:global/" + appName + "/SingletonBean!com.acme.SingletonRemote");
+ SingletonRemote singleton = (SingletonRemote) new InitialContext().lookup("java:global/" + appName + "/SingletonBean!com.acme.SingletonRemote");
- System.out.println("Waiting a few seconds for timer callback...");
- try {
- Thread.sleep(4000);
- } catch(Exception e) {
- e.printStackTrace();
- }
+ System.out.println("Waiting a few seconds for timer callback...");
+ try {
+ Thread.sleep(4000);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
- System.out.println("Test passed = " + singleton.getTestPassed());
+ System.out.println("Test passed = " + singleton.getTestPassed());
- if( singleton.getTestPassed() ) {
- stat.addStatus("local main", stat.PASS);
- } else {
- stat.addStatus("local main", stat.FAIL);
- }
+ if( singleton.getTestPassed() ) {
+ stat.addStatus("local main", stat.PASS);
+ } else {
+ stat.addStatus("local main", stat.FAIL);
+ }
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/sun-ejb-jar.xml
index c9b225d..6915cd0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/sun-ejb-jar.xml
@@ -21,6 +21,6 @@
<sun-ejb-jar>
<security-role-mapping>
<role-name>foo</role-name>
- <principal-name>bob</principal-name>
+ <principal-name>bob</principal-name>
</security-role-mapping>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/InterceptorA.java
index b35a245..ee79a41 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/InterceptorA.java
@@ -31,5 +31,5 @@
bean.mname = m.getName();
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
index ad18dfc..aa73094 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
@@ -40,50 +40,50 @@
String mname;
- @EJB
+ @EJB
private SingletonBean singleton;
@Resource
- private MessageDrivenContext mdc;
-
+ private MessageDrivenContext mdc;
+
@PostConstruct
public void init() {
System.out.println("In MessageBean::init()");
}
public void onMessage(Message message) {
- System.out.println("In MessageBean::onMessage()");
- System.out.println("getCallerPrincipal = " + mdc.getCallerPrincipal());
+ System.out.println("In MessageBean::onMessage()");
+ System.out.println("getCallerPrincipal = " + mdc.getCallerPrincipal());
verifyMethodName("onMessage");
}
@Schedule(second="*/1", minute="*", hour="*")
private void onTimeout() {
- System.out.println("In MessageBean::onTimeout()");
- System.out.println("getCallerPrincipal = " + mdc.getCallerPrincipal());
+ System.out.println("In MessageBean::onTimeout()");
+ System.out.println("getCallerPrincipal = " + mdc.getCallerPrincipal());
verifyMethodName("onTimeout");
- try {
- System.out.println("IsCallerInRole('foo')= " +
- mdc.isCallerInRole("foo"));
- throw new EJBException("Expecting IllegalStateEXception for call to isCallerInRole() from timer callback");
- } catch(IllegalStateException ise) {
- System.out.println("Successfully received exception for invocation of isCallerInRole from timer callback");
- }
-
+ try {
+ System.out.println("IsCallerInRole('foo')= " +
+ mdc.isCallerInRole("foo"));
+ throw new EJBException("Expecting IllegalStateEXception for call to isCallerInRole() from timer callback");
+ } catch(IllegalStateException ise) {
+ System.out.println("Successfully received exception for invocation of isCallerInRole from timer callback");
+ }
+
if (singleton.getAroundTimeoutCalled(null)) {
- singleton.test1Passed();
+ singleton.test1Passed();
}
}
private void onDDTimeout(Timer t) {
- System.out.println("In MessageBean::onDDTimeout()");
+ System.out.println("In MessageBean::onDDTimeout()");
if (singleton.getAroundTimeoutCalled((String)t.getInfo())) {
- singleton.test2Passed();
+ singleton.test2Passed();
}
}
-
+
@PreDestroy
public void destroy() {
System.out.println("In MessageBean::destroy()");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java
index 6494096..46cd841 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java
@@ -36,17 +36,17 @@
public void init() {
System.out.println("In SingletonBean::init()");
}
-
+
public void test1Passed() {
- passed1 = true;
+ passed1 = true;
}
public void test2Passed() {
- passed2 = true;
+ passed2 = true;
}
public boolean getTestPassed() {
- return passed1 && passed2;
+ return passed1 && passed2;
}
public boolean getAroundTimeoutCalled(String s) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.properties
index 9fc0842..4514e12 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-methodintf"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="client.timer31.methodintf.Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.xml
index dae6f4f..2f1b034 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,7 +51,7 @@
</antcall>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${jndiroot}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java
index 93c157c..761e5de 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java
@@ -25,12 +25,12 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
- public static void main(String args[]) {
+ public static void main(String args[]) {
stat.addDescription("ejb31-timer-methodintf");
try {
@@ -39,7 +39,7 @@
System.out.println("Waiting timers to expire for schedule_ann timer test");
Thread.sleep(8000);
System.out.println("Verifying timers transaction status");
- boolean pass = bean.verifyTimers();
+ boolean pass = bean.verifyTimers();
stat.addStatus("methodintf: ", ((pass)? stat.PASS : stat.FAIL) );
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.properties
index 08ea5f8..fcb6fc2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-nonpersistenttimer"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.xml
index a01e70e..eb3d2de 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="com/sun/s1asdev/ejb31/timer/nonpersistenttimer/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/StatefulWrapper.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -73,14 +73,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
index 0a357f1..6059111 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
@@ -25,14 +25,14 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
@EJB private static StatefulWrapper wrapper;
- public static void main(String args[]) {
+ public static void main(String args[]) {
boolean doJms = false; // TODO (args.length == 1) && (args[0].equalsIgnoreCase("jms"));
stat.addDescription("ejb31-timer-nonpersistenttimer");
@@ -54,22 +54,22 @@
stat.addStatus("Foo: ejbs/Foo_BMT", (result)? stat.PASS : stat.FAIL);
- /** TODO
+ /** TODO
result = wrapper.doMessageDrivenTest("jms/TimerMDBQueue_CMT", doJms);
- System.out.println("Message-driven test jms/TimerMDBQueue_CMT"
+ System.out.println("Message-driven test jms/TimerMDBQueue_CMT"
+ ((result)? " passed!!" : "failed!!"));
- stat.addStatus("Message-driven test: jms/TimerMDBQueue_CMT",
+ stat.addStatus("Message-driven test: jms/TimerMDBQueue_CMT",
(result)? stat.PASS : stat.FAIL);
result = wrapper.doMessageDrivenTest("jms/TimerMDBQueue_BMT", doJms);
- System.out.println("Message-driven test jms/TimerMDBQueue_BMT"
+ System.out.println("Message-driven test jms/TimerMDBQueue_BMT"
+ ((result)? " passed!!" : "failed!!"));
- stat.addStatus("Message-driven test: jms/TimerMDBQueue_BMT",
+ stat.addStatus("Message-driven test: jms/TimerMDBQueue_BMT",
(result)? stat.PASS : stat.FAIL);
- **/
+ **/
try {
- wrapper.removeFoo();
+ wrapper.removeFoo();
} catch(Exception e) {
e.printStackTrace();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
index 562be71..dc8ff30 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
@@ -40,7 +40,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -67,7 +67,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -96,7 +96,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -128,7 +128,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -160,7 +160,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/AppInfo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/AppInfo.java
index e3be7dc..7cd0d17 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/AppInfo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/AppInfo.java
@@ -28,6 +28,6 @@
public String toString()
{
- return foo;
+ return foo;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java
index 731db69..f1a2a4b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java
@@ -33,7 +33,7 @@
try {
System.out.println("In FooEJB::ejbTimeout --> " + t.getInfo());
if (t.isPersistent())
- throw new RuntimeException("FooEJB::ejbTimeout -> "
+ throw new RuntimeException("FooEJB::ejbTimeout -> "
+ t.getInfo() + " is PERSISTENT!!!");
} catch(RuntimeException e) {
System.out.println("got exception while calling getInfo");
@@ -52,7 +52,7 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
setContext(sc);
System.out.println("In FooEJB::setSessionContext");
@@ -64,7 +64,7 @@
}
public void ejbCreate() throws EJBException {
- System.out.println("In ejbnonpersistenttimer.Foo::ejbCreate !!");
+ System.out.println("In ejbnonpersistenttimer.Foo::ejbCreate !!");
setupJmsConnection();
checkGetSetRollbackOnly("ejbCreate", false);
checkCallerSecurityAccess("ejbCreate", false);
@@ -88,6 +88,6 @@
public void ejbPassivate() {
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
index a41cdce..bb52274 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
@@ -19,7 +19,7 @@
import jakarta.jms.*;
import jakarta.ejb.*;
-public class MessageDrivenEJB extends TimerStuffImpl
+public class MessageDrivenEJB extends TimerStuffImpl
implements MessageDrivenBean, TimedObject, MessageListener {
private MessageDrivenContext mdc;
@@ -36,7 +36,7 @@
System.out.println("Received message " + info + " , redelivered = " + redelivered);
if (info.equals("test1") ) {
- System.out.println("In onMessage : Got t for timer = " +
+ System.out.println("In onMessage : Got t for timer = " +
t.getInfo());
doTimerStuff("onMessage", true);
getInfo(t);
@@ -44,9 +44,9 @@
getTimeRemainingTest2(5, t);
cancelTimer(t);
-
+
createTimerAndCancel(10000000);
-
+
Timer t1 = createTimer(1000000, "messagedrivenejb");
cancelTimer(t1);
Timer t2 = createTimer(10000, "messagedrivenejb");
@@ -57,7 +57,7 @@
if( isBMT() ) {
cancelTimer(t);
} else {
- cancelTimerAndRollback(t);
+ cancelTimerAndRollback(t);
}
}
} else if( info.equals("test3") ) {
@@ -79,8 +79,8 @@
cancelTimer(t);
Timer ctar = createTimer(1, 1, "cancelTimerAndRollback");
cancelTimer(ctar);
- }
-
+ }
+
} catch(Exception e) {
e.printStackTrace();
}
@@ -90,7 +90,7 @@
checkCallerSecurityAccess("ejbTimeout", false);
try {
- System.out.println("In MessageDrivenEJB::ejbTimeout --> "
+ System.out.println("In MessageDrivenEJB::ejbTimeout --> "
+ t.getInfo());
} catch(RuntimeException e) {
System.out.println("got exception while calling getInfo");
@@ -109,9 +109,9 @@
}
public void setMessageDrivenContext(MessageDrivenContext mdc) {
- this.mdc = mdc;
+ this.mdc = mdc;
setContext(mdc);
- System.out.println("In ejbnonpersistenttimer.MessageDrivenEJB::setMessageDrivenContext !!");
+ System.out.println("In ejbnonpersistenttimer.MessageDrivenEJB::setMessageDrivenContext !!");
checkCallerSecurityAccess("setMessageDrivenContext", false);
getTimerService("setMessageDrivenContext", false);
@@ -119,7 +119,7 @@
}
public void ejbCreate() throws EJBException {
- System.out.println("In ejbnonpersistenttimer.MessageDrivenEJB::ejbCreate !!");
+ System.out.println("In ejbnonpersistenttimer.MessageDrivenEJB::ejbCreate !!");
setupJmsConnection();
checkGetSetRollbackOnly("ejbCreate", false);
checkCallerSecurityAccess("ejbCreate", false);
@@ -128,7 +128,7 @@
}
public void ejbRemove() {
- System.out.println("In ejbnonpersistenttimer.MessageDrivenEJB::ejbRemove !!");
+ System.out.println("In ejbnonpersistenttimer.MessageDrivenEJB::ejbRemove !!");
checkCallerSecurityAccess("ejbRemove", false);
checkGetSetRollbackOnly("ejbRemove", false);
getTimerService("ejbRemove", true);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
index 37ef97c..4c7e088 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
@@ -38,19 +38,19 @@
private QueueSender queueSender;
*/
- public boolean doMessageDrivenTest(String jndiName,
+ public boolean doMessageDrivenTest(String jndiName,
boolean jms) {
boolean result = false;
- /**
+ /**
if( jms ) { return; }
try {
System.out.println("********PG-> in doMessageDrivenTest() for jndiName = " + jndiName );
-
+
setup(setup);
System.out.println("********PG-> in doMessageDrivenTest() after setup");
Context ic = new InitialContext();
- Queue messageDrivenDest = (Queue) ic.lookup("java:comp/env/" + jndiName);
+ Queue messageDrivenDest = (Queue) ic.lookup("java:comp/env/" + jndiName);
System.out.println("Doing message driven tests for" + jndiName);
@@ -68,7 +68,7 @@
long sleepTime = 30000;
System.out.println("Sleeping for " + sleepTime / 1000 + " seconds");
Thread.sleep(sleepTime);
-
+
// at this point, all foo timers should have been cancelled
// by the message bean.
foo.assertNoTimers();
@@ -79,27 +79,27 @@
} finally {
cleanup();
}
- **/
+ **/
return result;
}
private void setup() throws Exception {
- /**
+ /**
//PG-> context = new InitialContext();
-
- TopicConnectionFactory topicConFactory =
+
+ TopicConnectionFactory topicConFactory =
(TopicConnectionFactory) context.lookup
("java:comp/env/jms/MyTopicConnectionFactory");
-
+
System.out.println("********PG-> setup(): after lookup");
topicCon = topicConFactory.createTopicConnection();
System.out.println("********PG-> setup(): after createTopicConnection");
- topicSession =
+ topicSession =
topicCon.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
System.out.println("********PG-> setup(): after createTopicSession");
-
+
// Producer will be specified when actual msg is published.
topicPublisher = topicSession.createPublisher(null);
System.out.println("********PG-> setup(): after createPublisher");
@@ -107,25 +107,25 @@
topicCon.start();
System.out.println("********PG-> setup(): after start");
- QueueConnectionFactory queueConFactory =
+ QueueConnectionFactory queueConFactory =
(QueueConnectionFactory) context.lookup
("java:comp/env/jms/MyQueueConnectionFactory");
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
queueCon.start();
- **/
+ **/
}
private void cleanup() {
- /**
+ /**
try {
if( topicCon != null ) {
topicCon.close();
@@ -139,7 +139,7 @@
**/
}
/**
- public void publishMsgs(Topic topic, Message msg, int num)
+ public void publishMsgs(Topic topic, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
System.out.println("Publishing message " + i + " to " + topic);
@@ -147,7 +147,7 @@
}
}
- public void sendMsgs(Queue queue, Message msg, int num)
+ public void sendMsgs(Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
System.out.println("Publishing message " + i + " to " + queue);
@@ -196,37 +196,37 @@
System.out.println("doTest(): creating the timer");
Timer timer = timerStuff.createTimer(1, 1);
-
+
//
System.out.println("doTest(): creating the timer2");
Timer timer2 = timerStuff.createTimer(10000, 10000);
-
+
//
System.out.println("doTest(): creating the timer3");
Timer timer3 = timerStuff.createTimer(new Date());
-
+
//
System.out.println("doTest(): creating the timer4");
Timer timer4 = timerStuff.createTimer(new Date(new Date().getTime() + 2000));
-
+
//
System.out.println("doTest(): creating the timer5");
Timer timer5 = timerStuff.createTimer(new Date(new Date().getTime() + 20000), 10000);
System.out.println("doTest(): creating the createTimerAndRollback");
timerStuff.createTimerAndRollback(20000);
-
+
//
System.out.println("doTest(): creating the createTimerAndCancel");
timerStuff.createTimerAndCancel(20000);
-
+
// @@@ reevaluate double cancel logic
//timerStuff.createTimerAndCancelAndCancel(20000);
-
+
//
System.out.println("doTest(): creating the createTimerAndCancelAndRollback");
timerStuff.createTimerAndCancelAndRollback(20000);
-
+
//
System.out.println("doTest(): creating the cancelTimer(timer2)");
timerStuff.cancelTimer(timer2);
@@ -237,18 +237,18 @@
timerStuff.cancelTimerAndRollback(timer5);
// @@@ reevaluate double cancel logic
//timerStuff.cancelTimerAndCancelAndRollback(timer6);
-
- Timer timer7 =
+
+ Timer timer7 =
timerStuff.createTimer(1, 1, "cancelTimer");
- Timer timer8 =
+ Timer timer8 =
timerStuff.createTimer(1, 1, "cancelTimerAndRollback");
- Timer timer9 =
+ Timer timer9 =
timerStuff.createTimer(1, "cancelTimerAndRollback");
Timer timer11 = timerStuff.getTimeRemainingTest1(20);
timerStuff.getTimeRemainingTest2(20, timer11);
timerStuff.getTimeRemainingTest2(20, timer);
-
+
Timer timer12 = timerStuff.getNextTimeoutTest1(20);
timerStuff.getNextTimeoutTest2(20, timer12);
timerStuff.getNextTimeoutTest2(20, timer);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java
index b0770e5..2aa251f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java
@@ -65,11 +65,11 @@
void assertTimerNotActive(Timer timer) throws Exception;
void sendMessageAndCreateTimer() throws Exception;
- void recvMessageAndCreateTimer(boolean expectMessage)
+ void recvMessageAndCreateTimer(boolean expectMessage)
throws Exception;
- void sendMessageAndCreateTimerAndRollback()
+ void sendMessageAndCreateTimerAndRollback()
throws Exception;
- void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
+ void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
throws Exception;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
index 1267451..65c17fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
@@ -33,14 +33,14 @@
import jakarta.jms.TextMessage;
public class TimerStuffImpl implements TimerStuff {
-
+
private static final int TX_CMT = 0;
private static final int TX_BMT = 1;
private static final int TX_UNSPECIFIED = 2;
-
+
private EJBContext context_;
private int txMode = TX_CMT;
-
+
private Queue queue;
private QueueSession session;
private QueueConnection connection;
@@ -60,12 +60,12 @@
} else {
txMode = TX_UNSPECIFIED;
}
- /** TODO
+ /** TODO
queue = (Queue) ic.lookup("java:comp/env/jms/MyQueue");
- qcFactory = (QueueConnectionFactory)
+ qcFactory = (QueueConnectionFactory)
ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
- **/
+ **/
} catch(Exception e) {
e.printStackTrace();
@@ -75,7 +75,7 @@
protected boolean isCMT() { return txMode == TX_CMT; }
protected boolean isBMT() { return txMode == TX_BMT; }
protected boolean isTxUnspecified() { return txMode == TX_UNSPECIFIED; }
-
+
public Timer createTimer(long duration, String info) throws Exception {
TimerService ts = context_.getTimerService();
Timer t = ts.createSingleActionTimer(duration, new TimerConfig(info, false));
@@ -86,30 +86,30 @@
return createTimer(duration, "createTimer<long>" + duration);
}
- public Timer createTimer(long initialDuration, long interval)
+ public Timer createTimer(long initialDuration, long interval)
throws Exception {
- return createTimer(initialDuration, interval,
+ return createTimer(initialDuration, interval,
"createTimer<long, long>" + initialDuration +
"," + interval);
}
- public Timer createTimer(long initialDuration, long interval,
- String info)
+ public Timer createTimer(long initialDuration, long interval,
+ String info)
throws Exception {
if( isBMT() ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(initialDuration, interval,
+ Timer t = ts.createIntervalTimer(initialDuration, interval,
new TimerConfig(new AppInfo(info), false));
-
+
if( isBMT() ) {
context_.getUserTransaction().commit();
}
return t;
}
- public Timer createTimer(Date expirationTime)
+ public Timer createTimer(Date expirationTime)
throws Exception {
TimerService ts = context_.getTimerService();
if( isBMT() ) {
@@ -120,7 +120,7 @@
// This should happen very rarely since container puts the brakes
// on a bit by adding a few seconds if, upon creation, the expiration
// time has already passed.
- Timer t = ts.createSingleActionTimer(expirationTime,
+ Timer t = ts.createSingleActionTimer(expirationTime,
new TimerConfig("createTimer<Date>" + expirationTime, false));
if( isBMT() ) {
context_.getUserTransaction().commit();
@@ -128,14 +128,14 @@
return t;
}
- public Timer createTimer(Date expirationTime, long interval)
+ public Timer createTimer(Date expirationTime, long interval)
throws Exception {
if( isBMT() ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(expirationTime, interval,
+ Timer t = ts.createIntervalTimer(expirationTime, interval,
new TimerConfig("createTimer<Date, long>" + expirationTime +
"," + interval, false));
if( isBMT() ) {
@@ -151,7 +151,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndRollback" + duration, false));
if( isBMT() ) {
context_.getUserTransaction().rollback();
@@ -165,7 +165,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndCancel" + duration, false));
t.cancel();
if( isBMT() ) {
@@ -175,12 +175,12 @@
public void createTimerAndCancelAndCancel(long duration) throws Exception {
if( isTxUnspecified() ) {
- return;
+ return;
} else if( isBMT() ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndCancelAndCancel"+ duration, false));
t.cancel();
t.cancel();
@@ -189,7 +189,7 @@
}
}
- public void createTimerAndCancelAndRollback(long duration)
+ public void createTimerAndCancelAndRollback(long duration)
throws Exception {
if( isTxUnspecified() ) {
return;
@@ -197,7 +197,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndCancelAndRollback" + duration, false));
t.cancel();
if( isBMT() ) {
@@ -242,8 +242,8 @@
context_.getUserTransaction().commit();
}
}
-
- public void cancelTimerAndRollback(Timer timer)
+
+ public void cancelTimerAndRollback(Timer timer)
throws Exception {
if( isTxUnspecified() ) {
return;
@@ -258,7 +258,7 @@
}
}
- public void cancelTimerAndCancelAndRollback(Timer timer)
+ public void cancelTimerAndCancelAndRollback(Timer timer)
throws Exception {
if( isTxUnspecified() ) {
return;
@@ -308,7 +308,7 @@
// success
} else {
throw new RemoteException("getTimers failure");
- }
+ }
}
public Timer getTimeRemainingTest1(int numIterations) throws Exception {
@@ -316,7 +316,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(1, 1,
+ Timer t = ts.createIntervalTimer(1, 1,
new TimerConfig("getTimeRemainingTest1", false));
System.out.println("Remaining times for " + t.getInfo());
for(int i = 0; i < numIterations; i++) {
@@ -345,7 +345,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(1, 1,
+ Timer t = ts.createIntervalTimer(1, 1,
new TimerConfig("getNextTimeoutTest1", false));
System.out.println("Remaining times for " + t.getInfo());
for(int i = 0; i < numIterations; i++) {
@@ -369,7 +369,7 @@
}
}
- // Make sure there are no active timers.
+ // Make sure there are no active timers.
public void assertNoTimers() throws Exception {
checkCallerSecurityAccess("assertNoTimers", true);
TimerService ts = context_.getTimerService();
@@ -379,11 +379,11 @@
}
}
- public void assertTimerNotActive(Timer timer)
+ public void assertTimerNotActive(Timer timer)
throws RemoteException {
try {
timer.getTimeRemaining();
- throw
+ throw
new Exception("assertTimerNotActive called with active timer");
} catch(NoSuchObjectLocalException nsole) {
// caught expected exception
@@ -392,10 +392,10 @@
}
}
- public Serializable getInfoNoError(Timer timer)
+ public Serializable getInfoNoError(Timer timer)
throws Exception {
return getInfo(timer, false);
-
+
}
public Serializable getInfo(Timer timer) throws Exception {
@@ -446,18 +446,18 @@
return;
}
- public void recvMessageAndCreateTimer(boolean expectMessage)
+ public void recvMessageAndCreateTimer(boolean expectMessage)
throws Exception {
if( isTxUnspecified() ) {
return;
}
try {
-
+
if( isBMT() ) {
context_.getUserTransaction().begin();
}
- recvMessageAndCreateTimer("recvMessageAndCreateTimer",
+ recvMessageAndCreateTimer("recvMessageAndCreateTimer",
expectMessage);
} catch(Exception e) {
@@ -471,7 +471,7 @@
return;
}
- public void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
+ public void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
throws Exception {
if( isTxUnspecified() ) {
@@ -511,7 +511,7 @@
Timer t = ts.createSingleActionTimer(1, new TimerConfig(timerName, false));
} catch(Exception e) {
throw e;
- }
+ }
return;
}
@@ -522,11 +522,11 @@
QueueReceiver receiver = session.createReceiver(queue);
// Send a message.
TextMessage message = (TextMessage) receiver.receiveNoWait();
-
+
if( message == null ) {
if( expectMessage ) {
throw new RemoteException("Expecting message in " +
- "recvMessageAndCreateTimerAndRollback");
+ "recvMessageAndCreateTimerAndRollback");
}
} else {
if( !expectMessage ) {
@@ -534,12 +534,12 @@
message.getText());
}
}
-
+
TimerService ts = context_.getTimerService();
Timer t = ts.createSingleActionTimer(1, new TimerConfig(timerName, false));
} catch(Exception e) {
throw e;
- }
+ }
return;
}
@@ -625,7 +625,7 @@
context_.getUserTransaction().begin();
txStarted = true;
}
- Timer t = ts.createIntervalTimer(1, 1,
+ Timer t = ts.createIntervalTimer(1, 1,
new TimerConfig("doTimerStuff_" + method, false));
t.cancel();
if( !allowed ) {
@@ -688,7 +688,7 @@
} catch(IllegalStateException e) { }
getTimerService("ejbTimeout", true);
doTimerStuff("ejbTimeout", true);
- }
+ }
}
protected void checkCallerSecurityAccess(String method, boolean allowed) {
@@ -730,19 +730,19 @@
protected void setupJmsConnection() {
- /** TODO
-
+ /** TODO
+
try {
InitialContext ic = new InitialContext();
connection = qcFactory.createQueueConnection();
session = connection.createQueueSession(true, 0);
connection.start();
} catch(Exception e) { e.printStackTrace(); }
- */
+ */
}
protected void cleanup() {
- /** TODO
+ /** TODO
if( connection != null ) {
try {
connection.close();
@@ -751,7 +751,7 @@
jmse.printStackTrace();
}
}
- **/
+ **/
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.properties
index 71dd1a1..6989f06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-reschedule-after-failures"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="test.client"\u0020
+ value="Client"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.xml
index 42f73c2..fdd85ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,20 +48,20 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Stles*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Stles.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="reset">
<param name="reset-value" value="true"/>
</antcall>
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="reset" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
@@ -74,13 +74,13 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="reset">
<param name="reset-value" value=""/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
index 7ddeae1..7b0379d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
@@ -23,25 +23,25 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
@EJB private static Stles bean;
- public static void main(String args[]) {
+ public static void main(String args[]) {
stat.addDescription("ejb31-timer-reschedule_after_failures");
try {
System.out.println("Creating timers for reschedule_after_failures timer test");
- bean.createTimers();
+ bean.createTimers();
System.out.println("Waiting some time for timers to fail and be rescheduled for reschedule_after_failures timer test");
Thread.sleep(24000);
System.out.println("Verifying timers for reschedule_after_failures timer test");
- bean.verifyTimers();
+ bean.verifyTimers();
stat.addStatus("reschedule_after_failures: ", stat.PASS );
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.properties
index 703c3a9..e3c23f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-schedule-ann"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.xml
index ffdf71a..89400a5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Stles*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Stles.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
index eb62bc4..b9f7f87 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
@@ -23,14 +23,14 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
@EJB private static Stles bean;
- public static void main(String args[]) {
+ public static void main(String args[]) {
boolean doJms = false; // TODO (args.length == 1) && (args[0].equalsIgnoreCase("jms"));
stat.addDescription("ejb31-timer-schedule_ann");
@@ -40,7 +40,7 @@
System.out.println("Waiting timers to expire for schedule_ann timer test");
Thread.sleep(12000);
System.out.println("Verifying timers for schedule_ann timer test");
- bean.verifyTimers();
+ bean.verifyTimers();
stat.addStatus("schedule_ann: ", stat.PASS );
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java
index ecbf26a..ddcce66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java
@@ -107,7 +107,7 @@
errors.add(info);
}
}
-
+
if (!expected_callers.isEmpty()) {
System.out.println("Missed info count: " + expected_callers.size());
StringBuffer sb = new StringBuffer();
@@ -134,12 +134,12 @@
for (String e : errors) {
sb.append("" + e).append(", ");
}
- throw new EJBException("Internal error: ScheduleExpressions for infos: "
+ throw new EJBException("Internal error: ScheduleExpressions for infos: "
+ sb.toString() + " were not available at verify!");
}
if (timerSvc.getTimers().size() != 0) {
- throw new EJBException("After cencel, timerSvc.getTimers().size() = "
+ throw new EJBException("After cencel, timerSvc.getTimers().size() = "
+ timerSvc.getTimers().size());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.properties
index 919e811..f4eb21e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.properties
@@ -15,15 +15,15 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-schedule-exp"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.xml
index 7651048..9899d8c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Stles*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Stles.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
index 623387d..fc26249 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
@@ -25,14 +25,14 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
@EJB private static Stles bean;
- public static void main(String args[]) {
+ public static void main(String args[]) {
boolean doJms = false; // TODO (args.length == 1) && (args[0].equalsIgnoreCase("jms"));
stat.addDescription("ejb31-timer-schedule_exp");
@@ -40,11 +40,11 @@
try {
System.out.println("Creating timers for schedule_exp timer test");
- bean.createTimers();
+ bean.createTimers();
System.out.println("Waiting timers to expire for schedule_exp timer test");
Thread.sleep(12000);
System.out.println("Verifying timers for schedule_exp timer test");
- bean.verifyTimers();
+ bean.verifyTimers();
stat.addStatus("schedule_exp: ", stat.PASS );
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
index 51e9fa7..f5f90b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
@@ -53,7 +53,7 @@
expected_callers.add("" + tc.getInfo());
int dayOfWeek = (now.get(Calendar.DAY_OF_WEEK) - 1); // SUN is 1
- System.out.println("createTimers(): creating timer with dayOfWeek=today-today ("
+ System.out.println("createTimers(): creating timer with dayOfWeek=today-today ("
+ dayOfWeek + "-" + dayOfWeek + ") ");
se = new ScheduleExpression().second("2 / 5").minute("*").hour("*").
dayOfWeek("" + dayOfWeek+" - " + dayOfWeek);
@@ -77,7 +77,7 @@
second -= 60;
}
- System.out.println("createTimers(): creating timer with second=" + (second + 5)
+ System.out.println("createTimers(): creating timer with second=" + (second + 5)
+ ", hour=" + s );
se = new ScheduleExpression().second(second + 5).minute("*").hour(s);
@@ -174,7 +174,7 @@
}
t.cancel();
}
-
+
if (!expected_callers.isEmpty()) {
StringBuffer sb = new StringBuffer();
for (String c : expected_callers) {
@@ -199,12 +199,12 @@
for (String e : errors) {
sb.append("" + e).append(", ");
}
- throw new EJBException("Internal error: ScheduleExpressions for infos: "
+ throw new EJBException("Internal error: ScheduleExpressions for infos: "
+ sb.toString() + " were not available at verify!");
}
if (timerSvc.getTimers().size() != 0) {
- throw new EJBException("After cencel, timerSvc.getTimers().size() = "
+ throw new EJBException("After cencel, timerSvc.getTimers().size() = "
+ timerSvc.getTimers().size());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.properties
index 81a9f7d..5132f2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-schedule-on-ejb-timeout"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.xml
index 92bd553..790592e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Stles*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Stles.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java
index 99ae483..561d14c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java
@@ -32,14 +32,14 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
@EJB private static Stles bean;
- public static void main(String args[]) {
+ public static void main(String args[]) {
stat.addDescription("ejb31-timer-schedule_on_ejb_timeout");
@@ -48,7 +48,7 @@
System.out.println("Waiting timers to expire for schedule_on_ejb_timeout timer test");
Thread.sleep(2000);
System.out.println("Verifying timers for schedule_on_ejb_timeout timer test");
- bean.verifyTimers();
+ bean.verifyTimers();
stat.addStatus("schedule_on_ejb_timeout: ", stat.PASS );
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml
index 48e8ca4..26d9ac5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml
@@ -19,7 +19,7 @@
<ejb-jar 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/ejb-jar_3_1.xsd"
+ http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
version="3.1">
<enterprise-beans>
<session>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java
index 953da94..2ef5ff9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java
@@ -48,9 +48,9 @@
public void verifyTimers() throws Exception {
if (!timers.contains("Timer01"))
- throw new EJBException("Timer01 hadn't fired");
+ throw new EJBException("Timer01 hadn't fired");
if (!timers.contains("Timer00"))
- throw new EJBException("Timer00 hadn't fired");
+ throw new EJBException("Timer00 hadn't fired");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/build.xml
index ccb865c..9eeb31d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/build.xml
@@ -105,10 +105,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32 tests in a full profile)
- ant lite (Executes set of the ejb-ejb32 tests in a lite profile)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32 tests in a full profile)
+ ant lite (Executes set of the ejb-ejb32 tests in a lite profile)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.properties
index acbded9..e9f6d9e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb32-ejblite-async"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.xml
index 95c0eb3..80265b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.xml
@@ -34,11 +34,11 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
- </antcall>
+ </antcall>
</target>
<target name="build" depends="compile">
@@ -48,9 +48,9 @@
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,9 +58,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java
index 7205b70..84a8313 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java
@@ -35,7 +35,7 @@
@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
+ System.out.println("In HelloServlet::init");
}
@EJB SingletonBean sb;
@@ -46,13 +46,13 @@
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- try {
+ try {
sb.hello();
@@ -80,18 +80,18 @@
}
- } catch(RuntimeException e) {
- throw e;
- } catch(Exception e) {
- throw new RuntimeException(e);
+ } catch(RuntimeException e) {
+ throw e;
+ } catch(Exception e) {
+ throw new RuntimeException(e);
}
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
index 4d6a53c..96004a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
@@ -37,24 +37,24 @@
@PostConstruct
public void init() {
System.out.println("In SingletonBean::init()");
- System.out.println("Thread = " + Thread.currentThread());
- me.fooAsync();
+ System.out.println("Thread = " + Thread.currentThread());
+ me.fooAsync();
}
-
+
public String hello() {
- System.out.println("In SingletonBean::hello()");
- return "hello, world!\n";
+ System.out.println("In SingletonBean::hello()");
+ return "hello, world!\n";
}
@Asynchronous
public void fooAsync() {
- System.out.println("In SingletonBean::fooAsync()");
- System.out.println("Thread = " + Thread.currentThread());
- gotAsyncCall = true;
+ System.out.println("In SingletonBean::fooAsync()");
+ System.out.println("Thread = " + Thread.currentThread());
+ gotAsyncCall = true;
}
public boolean getPassed() {
- return gotAsyncCall;
+ return gotAsyncCall;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java
index 3a92359..e46c7a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java
@@ -29,7 +29,7 @@
}
public void hello() {
- System.out.println("In StatefulBean::hello()");
+ System.out.println("In StatefulBean::hello()");
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java
index ae2767f..c1a2fd9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java
@@ -30,7 +30,7 @@
}
public void hello() {
- System.out.println("In StatefulBean2::hello()");
+ System.out.println("In StatefulBean2::hello()");
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/build.xml
index 011ba45..fe24bab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb32-ejblite tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb32-ejblite tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.properties
index 95d5f27..182c7a7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb32-ejblite-timer"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.xml
index d8c7d47..88c76d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.xml
@@ -34,11 +34,11 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
- </antcall>
+ </antcall>
</target>
<target name="build" depends="compile">
@@ -48,9 +48,9 @@
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,9 +58,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/AppInfo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/AppInfo.java
index 0e7864c..da31643 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/AppInfo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/AppInfo.java
@@ -28,6 +28,6 @@
public String toString()
{
- return foo;
+ return foo;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java
index 5f12bff..08d5e09 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java
@@ -31,7 +31,7 @@
try {
System.out.println("In FooBMT::Timeout --> " + t.getInfo());
if (t.isPersistent())
- throw new RuntimeException("FooBMT::Timeout -> "
+ throw new RuntimeException("FooBMT::Timeout -> "
+ t.getInfo() + " is PERSISTENT!!!");
} catch(RuntimeException e) {
System.out.println("got exception while calling getInfo");
@@ -51,7 +51,7 @@
@PostConstruct
private void init() throws EJBException {
- System.out.println("In ejblite.timer.Foo::init !!");
+ System.out.println("In ejblite.timer.Foo::init !!");
isBMT = true;
setContext(sc);
getTimerService("init", true);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java
index cf9437e..0357a2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java
@@ -30,7 +30,7 @@
try {
System.out.println("In FooCMT::Timeout --> " + t.getInfo());
if (t.isPersistent())
- throw new RuntimeException("FooCMT::Timeout -> "
+ throw new RuntimeException("FooCMT::Timeout -> "
+ t.getInfo() + " is PERSISTENT!!!");
} catch(RuntimeException e) {
System.out.println("got exception while calling getInfo");
@@ -50,7 +50,7 @@
@PostConstruct
private void init() throws EJBException {
- System.out.println("In ejblite.timer.Foo::init !!");
+ System.out.println("In ejblite.timer.Foo::init !!");
setContext(sc);
getTimerService("init", true);
doTimerStuff("init", false);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java
index 51c2da9..de09b43 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java
@@ -36,46 +36,46 @@
@WebServlet(urlPatterns="/HelloServlet", loadOnStartup=1)
public class HelloServlet extends HttpServlet {
- @EJB
+ @EJB
private StatefulWrapper wrapper;
@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
+ System.out.println("In HelloServlet::init");
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- try {
+ try {
boolean result = wrapper.doFooTest(true);
- if (!result)
+ if (!result)
throw new RuntimeException("BMT failed");
else
System.out.println("In HelloServlet::BMT passed");
result = wrapper.doFooTest(false);
- if (!result)
+ if (!result)
throw new RuntimeException("CMT failed");
else
System.out.println("In HelloServlet::CMT passed");
-
- } catch(RuntimeException e) {
- throw e;
- } catch(Exception e) {
- throw new RuntimeException(e);
- } finally {
+
+ } catch(RuntimeException e) {
+ throw e;
+ } catch(Exception e) {
+ throw new RuntimeException(e);
+ } finally {
try {
wrapper.removeFoo();
} catch(Exception e) {
@@ -84,11 +84,11 @@
}
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java
index d83116a..83d30c5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java
@@ -57,37 +57,37 @@
System.out.println("doTest(): creating the timer");
Timer timer = timerStuff.createTimer(1, 1);
-
+
//
System.out.println("doTest(): creating the timer2");
Timer timer2 = timerStuff.createTimer(10000, 10000);
-
+
//
System.out.println("doTest(): creating the timer3");
Timer timer3 = timerStuff.createTimer(new Date());
-
+
//
System.out.println("doTest(): creating the timer4");
Timer timer4 = timerStuff.createTimer(new Date(new Date().getTime() + 2000));
-
+
//
System.out.println("doTest(): creating the timer5");
Timer timer5 = timerStuff.createTimer(new Date(new Date().getTime() + 20000), 10000);
System.out.println("doTest(): creating the createTimerAndRollback");
timerStuff.createTimerAndRollback(20000);
-
+
//
System.out.println("doTest(): creating the createTimerAndCancel");
timerStuff.createTimerAndCancel(20000);
-
+
// @@@ reevaluate double cancel logic
//timerStuff.createTimerAndCancelAndCancel(20000);
-
+
//
System.out.println("doTest(): creating the createTimerAndCancelAndRollback");
timerStuff.createTimerAndCancelAndRollback(20000);
-
+
//
System.out.println("doTest(): creating the cancelTimer(timer2)");
timerStuff.cancelTimer(timer2);
@@ -98,18 +98,18 @@
timerStuff.cancelTimerAndRollback(timer5);
// @@@ reevaluate double cancel logic
//timerStuff.cancelTimerAndCancelAndRollback(timer6);
-
- Timer timer7 =
+
+ Timer timer7 =
timerStuff.createTimer(1, 1, "cancelTimer");
- Timer timer8 =
+ Timer timer8 =
timerStuff.createTimer(1, 1, "cancelTimerAndRollback");
- Timer timer9 =
+ Timer timer9 =
timerStuff.createTimer(1, "cancelTimerAndRollback");
Timer timer11 = timerStuff.getTimeRemainingTest1(20);
timerStuff.getTimeRemainingTest2(20, timer11);
timerStuff.getTimeRemainingTest2(20, timer);
-
+
Timer timer12 = timerStuff.getNextTimeoutTest1(20);
timerStuff.getNextTimeoutTest2(20, timer12);
timerStuff.getNextTimeoutTest2(20, timer);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java
index 9d75068..0722bc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java
@@ -26,12 +26,12 @@
import jakarta.ejb.*;
public class TimerStuffImpl implements TimerStuff {
-
+
private EJBContext context_;
protected boolean isBMT = false;
protected boolean cancelAutomaticTimer = false;
-
+
public TimerStuffImpl() {}
protected void setContext(EJBContext context) {
@@ -40,7 +40,7 @@
// XXX - TODO
protected boolean isTxUnspecified() { return false; }
-
+
public Timer createTimer(long duration, String info) throws Exception {
TimerService ts = context_.getTimerService();
Timer t = ts.createSingleActionTimer(duration, new TimerConfig(info, false));
@@ -51,30 +51,30 @@
return createTimer(duration, "createTimer<long>" + duration);
}
- public Timer createTimer(long initialDuration, long interval)
+ public Timer createTimer(long initialDuration, long interval)
throws Exception {
- return createTimer(initialDuration, interval,
+ return createTimer(initialDuration, interval,
"createTimer<long, long>" + initialDuration +
"," + interval);
}
- public Timer createTimer(long initialDuration, long interval,
- String info)
+ public Timer createTimer(long initialDuration, long interval,
+ String info)
throws Exception {
if( isBMT ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(initialDuration, interval,
+ Timer t = ts.createIntervalTimer(initialDuration, interval,
new TimerConfig(new AppInfo(info), false));
-
+
if( isBMT ) {
context_.getUserTransaction().commit();
}
return t;
}
- public Timer createTimer(Date expirationTime)
+ public Timer createTimer(Date expirationTime)
throws Exception {
TimerService ts = context_.getTimerService();
if( isBMT ) {
@@ -85,7 +85,7 @@
// This should happen very rarely since container puts the brakes
// on a bit by adding a few seconds if, upon creation, the expiration
// time has already passed.
- Timer t = ts.createSingleActionTimer(expirationTime,
+ Timer t = ts.createSingleActionTimer(expirationTime,
new TimerConfig("createTimer<Date>" + expirationTime, false));
if( isBMT ) {
context_.getUserTransaction().commit();
@@ -93,14 +93,14 @@
return t;
}
- public Timer createTimer(Date expirationTime, long interval)
+ public Timer createTimer(Date expirationTime, long interval)
throws Exception {
if( isBMT ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(expirationTime, interval,
+ Timer t = ts.createIntervalTimer(expirationTime, interval,
new TimerConfig("createTimer<Date, long>" + expirationTime +
"," + interval, false));
if( isBMT ) {
@@ -116,7 +116,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndRollback" + duration, false));
if( isBMT ) {
context_.getUserTransaction().rollback();
@@ -130,7 +130,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndCancel" + duration, false));
t.cancel();
if( isBMT ) {
@@ -140,12 +140,12 @@
public void createTimerAndCancelAndCancel(long duration) throws Exception {
if( isTxUnspecified() ) {
- return;
+ return;
} else if( isBMT ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndCancelAndCancel"+ duration, false));
t.cancel();
t.cancel();
@@ -154,7 +154,7 @@
}
}
- public void createTimerAndCancelAndRollback(long duration)
+ public void createTimerAndCancelAndRollback(long duration)
throws Exception {
if( isTxUnspecified() ) {
return;
@@ -162,7 +162,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndCancelAndRollback" + duration, false));
t.cancel();
if( isBMT ) {
@@ -212,8 +212,8 @@
context_.getUserTransaction().commit();
}
}
-
- public void cancelTimerAndRollback(Timer timer)
+
+ public void cancelTimerAndRollback(Timer timer)
throws Exception {
if( isTxUnspecified() ) {
return;
@@ -228,7 +228,7 @@
}
}
- public void cancelTimerAndCancelAndRollback(Timer timer)
+ public void cancelTimerAndCancelAndRollback(Timer timer)
throws Exception {
if( isTxUnspecified() ) {
return;
@@ -278,7 +278,7 @@
// success
} else {
throw new RemoteException("getTimers failure");
- }
+ }
}
public Timer getTimeRemainingTest1(int numIterations) throws Exception {
@@ -286,7 +286,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(1, 1,
+ Timer t = ts.createIntervalTimer(1, 1,
new TimerConfig("getTimeRemainingTest1", false));
System.out.println("Remaining times for " + t.getInfo());
for(int i = 0; i < numIterations; i++) {
@@ -315,7 +315,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(1, 1,
+ Timer t = ts.createIntervalTimer(1, 1,
new TimerConfig("getNextTimeoutTest1", false));
System.out.println("Remaining times for " + t.getInfo());
for(int i = 0; i < numIterations; i++) {
@@ -339,7 +339,7 @@
}
}
- // Make sure there are no active timers.
+ // Make sure there are no active timers.
public void assertNoTimers() throws Exception {
TimerService ts = context_.getTimerService();
Collection timers= ts.getTimers();
@@ -348,11 +348,11 @@
}
}
- public void assertTimerNotActive(Timer timer)
+ public void assertTimerNotActive(Timer timer)
throws RemoteException {
try {
timer.getTimeRemaining();
- throw
+ throw
new Exception("assertTimerNotActive called with active timer");
} catch(NoSuchObjectLocalException nsole) {
// caught expected exception
@@ -361,10 +361,10 @@
}
}
- public Serializable getInfoNoError(Timer timer)
+ public Serializable getInfoNoError(Timer timer)
throws Exception {
return getInfo(timer, false);
-
+
}
public Serializable getInfo(Timer timer) throws Exception {
@@ -452,7 +452,7 @@
context_.getUserTransaction().begin();
txStarted = true;
}
- Timer t = ts.createIntervalTimer(1, 1,
+ Timer t = ts.createIntervalTimer(1, 1,
new TimerConfig("doTimerStuff_" + method, false));
t.cancel();
if( !allowed ) {
@@ -521,7 +521,7 @@
} catch(IllegalStateException e) { }
getTimerService("Timeout", true);
doTimerStuff("Timeout", true);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.properties
index f814f44..d0caa3d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb32-embedded-autoclose"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.xml
index 9667a02..659af97 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,21 +49,21 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java
index 221f72e..563e605 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java
@@ -35,5 +35,5 @@
private void onDestroy() {
x.add("=====destroyed=====");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/build.xml
index 6f6aa31..920f6b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/build.xml
@@ -89,9 +89,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-embedded tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-embedded tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.properties
index 4cb3eec..ea54b9d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-around-construct-ann"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.xml
index 0806155..c4e4d7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,8 +50,8 @@
value="**/Interceptor*.class,**/S*.class,**/B*.class"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
index 11d3292..e4dab56 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
@@ -34,7 +34,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
verify("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Remove
@@ -44,7 +44,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
index 7176402..cf0329a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
@@ -33,12 +33,12 @@
System.out.println("In SingletonBean::init()");
sful.hello();
}
-
+
public String hello() {
verify("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
index 09e3afa..7d91291 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
@@ -33,18 +33,18 @@
@PostConstruct
private void init() {
- System.out.println("In SomeManagedBean::init() " + this);
+ System.out.println("In SomeManagedBean::init() " + this);
}
-
+
public void foo() {
- System.out.println("In SomeManagedBean::foo() ");
- verifyA("SomeManagedBean");
+ System.out.println("In SomeManagedBean::foo() ");
+ verifyA("SomeManagedBean");
if (orb == null) throw new RuntimeException("SomeManagedBean: ORB is null");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean::destroy() ");
+ System.out.println("In SomeManagedBean::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
index dde1c43..fdb04c2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
@@ -32,17 +32,17 @@
@PostConstruct
private void init() {
- System.out.println("In SomeManagedBean2::init() " + this);
+ System.out.println("In SomeManagedBean2::init() " + this);
}
-
+
public void foo() {
- System.out.println("In SomeManagedBean2::foo() ");
+ System.out.println("In SomeManagedBean2::foo() ");
if (orb == null) throw new RuntimeException("SomeManagedBean2: ORB is null");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean2::destroy() ");
+ System.out.println("In SomeManagedBean2::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
index dfe08fa..6bb1c90 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
@@ -31,7 +31,7 @@
@Resource ORB orb;
public void foo() {
- System.out.println("In SomeManagedBean3::foo() ");
+ System.out.println("In SomeManagedBean3::foo() ");
if (orb == null) throw new RuntimeException("SomeManagedBean3: ORB is null");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/build.xml
index 307f65e..adc2d42 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-aroundconstruct tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-aroundconstruct tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.properties
index a729a7d..0a479c8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-around-construct-descr"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="ejb-jar.xml" value="descriptors/ejb-jar.xml"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.xml
index 92865e8..916340f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,11 +48,11 @@
<antcall target="ejb-jar-common">
<param name="ejbjar.classes"
value="**/Interceptor*.class,**/S*.class,**/B*.class"/>
- <param name="beans.xml" value="descriptors/beans.xml"/>
+ <param name="beans.xml" value="descriptors/beans.xml"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -66,10 +66,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
index 7be7138..0686cc5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
@@ -33,7 +33,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
verify("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Remove
@@ -43,7 +43,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
index 35a2893..bcce20c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
@@ -32,12 +32,12 @@
System.out.println("In SingletonBean::init()");
sful.hello();
}
-
+
public String hello() {
verify("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java
index 58fe2a6..3c97ed7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java
@@ -29,18 +29,18 @@
@PostConstruct
private void init() {
- System.out.println("In SomeManagedBean::init() " + this);
+ System.out.println("In SomeManagedBean::init() " + this);
}
-
+
public void foo() {
- System.out.println("In SomeManagedBean::foo() ");
- // verify("SomeManagedBean");
+ System.out.println("In SomeManagedBean::foo() ");
+ // verify("SomeManagedBean");
if (orb == null) throw new RuntimeException("SomeManagedBean: ORB is null");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean::destroy() ");
+ System.out.println("In SomeManagedBean::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/build.xml
index cf32028..53c33a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/build.xml
@@ -53,9 +53,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-interceptors tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-interceptors tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.properties
index e35bfea..b4bf7b9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-constructor-level-ann"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.xml
index 6a412dd..a73fbc5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,8 +50,8 @@
value="**/Interceptor*.class,**/S*.class,**/B*.class"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
index 6fb1cf9..1d0984e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
@@ -39,7 +39,7 @@
if (method == null) {
if (name != null) throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got null");
} else {
- if (!method.getName().equals(name))
+ if (!method.getName().equals(name))
throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got: " + method.getName());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
index 582421f..208e61d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
@@ -38,7 +38,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
verify("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Interceptors(InterceptorA.class)
@@ -49,7 +49,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
verifyMethod(null);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
index 364227b..f0ab00b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
@@ -38,13 +38,13 @@
verifyMethod("init");
sful.hello();
}
-
+
@Interceptors(InterceptorC.class)
public String hello() {
verifyAB_AC("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
index 0138d72..18dfe4b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
@@ -35,14 +35,14 @@
@Interceptors(InterceptorA.class)
public void foo() {
- System.out.println("In SomeManagedBean::foo() ");
- verifyA("SomeManagedBean");
+ System.out.println("In SomeManagedBean::foo() ");
+ verifyA("SomeManagedBean");
if (orb == null) throw new RuntimeException("SomeManagedBean: ORB is null");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean::destroy() ");
+ System.out.println("In SomeManagedBean::destroy() ");
verifyMethod("destroy");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
index db8a8c7..b09bf0b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
@@ -35,13 +35,13 @@
@Interceptors(InterceptorA.class)
public void foo2() {
- System.out.println("In SomeManagedBean2::foo2() ");
- verifyAC_AC("SomeManagedBean2");
+ System.out.println("In SomeManagedBean2::foo2() ");
+ verifyAC_AC("SomeManagedBean2");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean2::destroy() ");
+ System.out.println("In SomeManagedBean2::destroy() ");
verifyMethod("destroy");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
index 4622352..b1ec38a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
@@ -36,18 +36,18 @@
@PostConstruct
private void init3() {
- System.out.println("In SomeManagedBean3::init3() " + this);
+ System.out.println("In SomeManagedBean3::init3() " + this);
}
-
+
@Interceptors(InterceptorA.class)
public void foo3() {
- System.out.println("In SomeManagedBean3::foo3() ");
- verifyA("SomeManagedBean3");
+ System.out.println("In SomeManagedBean3::foo3() ");
+ verifyA("SomeManagedBean3");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean3::destroy() ");
+ System.out.println("In SomeManagedBean3::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/build.xml
index a667e6b..1c1a974 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-method-constructor-level tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-method-constructor-level tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.properties
index a521657..bff9920 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-constructor-level-descr"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="ejb-jar.xml" value="descriptors/ejb-jar.xml"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.xml
index 96031eb..2820fba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,8 +51,8 @@
<param name="beans.xml" value="descriptors/beans.xml"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -66,10 +66,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
index 5cfd62e..4ad4d9a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
@@ -39,7 +39,7 @@
if (method == null) {
if (name != null) throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got null");
} else {
- if (!method.getName().equals(name))
+ if (!method.getName().equals(name))
throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got: " + method.getName());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
index ffb584d..0b77c11 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
@@ -35,7 +35,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
verify("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Remove
@@ -45,7 +45,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
verifyMethod(null);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
index c19d4a9..3773738 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
@@ -36,12 +36,12 @@
verifyMethod("init");
sful.hello();
}
-
+
public String hello() {
verifyAB_AC("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.properties
index 9c3398f..ad9e2e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-get-method-lc-ann"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.xml
index 3e0bcae..c3e7912 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,8 +50,8 @@
value="**/Interceptor*.class,**/S*.class,**/B*.class"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
index 003b416..9f8462b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
@@ -45,7 +45,7 @@
if (method == null) {
if (name != null) throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got null");
} else {
- if (!method.getName().equals(name))
+ if (!method.getName().equals(name))
throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got: " + method.getName());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
index 6ef028e..e9b5d73 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
@@ -39,7 +39,7 @@
System.out.println("In SfulEJB:hello()");
verifyAB_AC("SfulEJB");
verifyB_PC("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Interceptors(InterceptorA.class)
@@ -50,7 +50,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
verifyMethod(null);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
index 9b15694..c223a64 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
@@ -38,14 +38,14 @@
verifyMethod("init");
sful.hello();
}
-
+
@Interceptors(InterceptorC.class)
public String hello() {
verifyAB_AC("SingletonBean");
verifyA_PC("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
index 562d8db..67d35fe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
@@ -31,23 +31,23 @@
@PostConstruct
private void init() {
- System.out.println("In SomeManagedBean::init() " + this);
+ System.out.println("In SomeManagedBean::init() " + this);
verifyMethod(null);
}
-
+
@Interceptors(InterceptorA.class)
public void foo() {
- System.out.println("In SomeManagedBean::foo() ");
- verifyA_AC("SomeManagedBean");
- verifyA_AI("SomeManagedBean");
+ System.out.println("In SomeManagedBean::foo() ");
+ verifyA_AC("SomeManagedBean");
+ verifyA_AI("SomeManagedBean");
ai = false;
if (orb == null) throw new RuntimeException("SomeManagedBean: ORB is null");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean::destroy() ");
+ System.out.println("In SomeManagedBean::destroy() ");
verifyMethod(null);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/build.xml
index 32f9538..00f18e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-get_method_lc tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-get_method_lc tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.properties
index 0045747..bdcf7fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-get-method-lc-descr"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="ejb-jar.xml" value="descriptors/ejb-jar.xml"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.xml
index f1a87e6..240e381 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,8 +51,8 @@
<param name="beans.xml" value="descriptors/beans.xml"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -66,10 +66,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
index 65fb797..19d1e2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
@@ -42,7 +42,7 @@
if (method == null) {
if (name != null) throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got null");
} else {
- if (!method.getName().equals(name))
+ if (!method.getName().equals(name))
throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got: " + method.getName());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
index 6f181b0..71e0b29 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
@@ -36,7 +36,7 @@
System.out.println("In SfulEJB:hello()");
verifyB_AC("SfulEJB");
verifyB_PC("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Remove
@@ -46,7 +46,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
verifyMethod(null);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
index a6b10c7..ffd2f95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
@@ -34,14 +34,14 @@
verifyMethod("init");
sful.hello();
}
-
+
public String hello() {
verifyA_AC("SingletonBean");
//verifyAB_AC("SingletonBean");
verifyA_PC("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.properties
index c0f0c4b..a148737 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-interceptors-inheritance"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.xml
index ea36dc5..f363302 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,8 +50,8 @@
value="**/Interceptor*.class,**/S*.class,**/B*.class"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
index ca7ab45..33ead8d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
@@ -29,20 +29,20 @@
@AroundInvoke
private Object interceptCall(InvocationContext ctx) throws Exception {
- System.out.println("**BaseBean AROUND-INVOKE++ [@AroundInvoke]: " + ctx.getMethod());
+ System.out.println("**BaseBean AROUND-INVOKE++ [@AroundInvoke]: " + ctx.getMethod());
ai = true;
return ctx.proceed();
}
@PostConstruct
private void init() {
- System.out.println("**BaseBean PostConstruct");
+ System.out.println("**BaseBean PostConstruct");
pc = true;
}
@PreDestroy
private void destroy() {
- System.out.println("**BaseBean PreDestroy");
+ System.out.println("**BaseBean PreDestroy");
pd = true;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
index 171dea1..f47977d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
@@ -33,7 +33,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
- return sless.sayHello();
+ return sless.sayHello();
}
@Remove
@@ -43,7 +43,7 @@
@AroundInvoke
private Object interceptCall0(InvocationContext ctx) throws Exception {
- System.out.println("**SfulEJB AROUND-INVOKE++ [@AroundInvoke]: " + ctx.getMethod());
+ System.out.println("**SfulEJB AROUND-INVOKE++ [@AroundInvoke]: " + ctx.getMethod());
if (!ai) throw new RuntimeException("BaseBean was not called");
ai = false; //reset
return ctx.proceed();
@@ -51,14 +51,14 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
if (!pc) throw new RuntimeException("BaseBean was not called");
pc = false; //reset
}
@PreDestroy
private void destroy0() {
- System.out.println("**SfulEJB PreDestroy");
+ System.out.println("**SfulEJB PreDestroy");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
index 8a53360..2efe724 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
@@ -33,11 +33,11 @@
System.out.println("In SingletonBean::init()");
sful.hello();
}
-
+
public String hello() {
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
index 168ebc2..7023666 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
@@ -24,7 +24,7 @@
@Interceptors(InterceptorA.class)
public class SlessEJB extends BaseBean implements Sless {
public String sayHello() {
- return "Hello";
+ return "Hello";
}
@AroundInvoke
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.properties
index 4c1d80b..9a065c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-method-constructor-level-ann"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.xml
index dacd393..3568d17 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,8 +50,8 @@
value="**/Interceptor*.class,**/S*.class,**/B*.class"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java
index 83fd073..d28ce5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
index f77514b..69e5bac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
@@ -42,7 +42,7 @@
if (method == null) {
if (name != null) throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got null");
} else {
- if (!method.getName().equals(name))
+ if (!method.getName().equals(name))
throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got: " + method.getName());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
index 45ac3b0..ea3b7be 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
@@ -38,7 +38,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
verify("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Interceptors(InterceptorA.class)
@@ -50,7 +50,7 @@
@Interceptors(InterceptorA.class)
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
verifyMethod("init0");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
index 9e1b454..fa74919 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
@@ -39,14 +39,14 @@
verifyMethod("init");
sful.hello();
}
-
+
@Interceptors(InterceptorC.class)
public String hello() {
verifyAB_AC("SingletonBean");
verifyAC_PC("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@Interceptors(InterceptorB.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
index d5c061b..c5dbf3a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
@@ -36,22 +36,22 @@
@Interceptors(InterceptorA.class)
@PostConstruct
private void init() {
- System.out.println("In SomeManagedBean::init() " + this);
+ System.out.println("In SomeManagedBean::init() " + this);
verifyMethod("init");
}
-
+
@Interceptors(InterceptorA.class)
public void foo() {
- System.out.println("In SomeManagedBean::foo() ");
- verifyA("SomeManagedBean");
+ System.out.println("In SomeManagedBean::foo() ");
+ verifyA("SomeManagedBean");
if (orb == null) throw new RuntimeException("SomeManagedBean: ORB is null");
}
@Interceptors(InterceptorA.class)
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean::destroy() ");
+ System.out.println("In SomeManagedBean::destroy() ");
verifyMethod("destroy");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
index 14bee20..bd0cc69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
@@ -37,21 +37,21 @@
@Interceptors(InterceptorA.class)
@PostConstruct
private void init2() {
- System.out.println("In SomeManagedBean2::init2() " + this);
+ System.out.println("In SomeManagedBean2::init2() " + this);
verifyMethod("init2");
}
-
+
@Interceptors(InterceptorA.class)
public void foo2() {
- System.out.println("In SomeManagedBean2::foo2() ");
- verifyAC_AC("SomeManagedBean2");
- verifyA_PC("SomeManagedBean2");
+ System.out.println("In SomeManagedBean2::foo2() ");
+ verifyAC_AC("SomeManagedBean2");
+ verifyA_PC("SomeManagedBean2");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean2::destroy() ");
+ System.out.println("In SomeManagedBean2::destroy() ");
verifyMethod("destroy");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
index 52d307c..505e653 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
@@ -37,21 +37,21 @@
@Interceptors(InterceptorA.class)
@PostConstruct
private void init3() {
- System.out.println("In SomeManagedBean3::init3() " + this);
+ System.out.println("In SomeManagedBean3::init3() " + this);
verifyMethod("init3");
}
-
+
@Interceptors(InterceptorA.class)
public void foo3() {
- System.out.println("In SomeManagedBean3::foo3() ");
- verifyA_AC("SomeManagedBean3");
- verifyAC_PC("SomeManagedBean3");
+ System.out.println("In SomeManagedBean3::foo3() ");
+ verifyA_AC("SomeManagedBean3");
+ verifyAC_PC("SomeManagedBean3");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean3::destroy() ");
+ System.out.println("In SomeManagedBean3::destroy() ");
verifyMethod("destroy");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/build.xml
index a667e6b..1c1a974 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-method-constructor-level tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-method-constructor-level tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.properties
index 09ee581..f5d6caa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-method-constructor-level-descr"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="ejb-jar.xml" value="descriptors/ejb-jar.xml"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.xml
index 02fa25b..6cf2855 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,8 +51,8 @@
<param name="beans.xml" value="descriptors/beans.xml"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -66,10 +66,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java
index 83fd073..d28ce5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
index 65fb797..19d1e2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
@@ -42,7 +42,7 @@
if (method == null) {
if (name != null) throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got null");
} else {
- if (!method.getName().equals(name))
+ if (!method.getName().equals(name))
throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got: " + method.getName());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
index 0154a3a..06dc47a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
@@ -35,7 +35,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
verify("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Remove
@@ -45,7 +45,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
verifyMethod("init0");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
index c1e655b..1a9a1ea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
@@ -36,13 +36,13 @@
verifyMethod("init");
sful.hello();
}
-
+
public String hello() {
verifyAB_AC("SingletonBean");
verifyAC_PC("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.properties
index 33d721b..82cf694 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb32-intrfaces"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="client.intrfaces.Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.xml
index 8e14c8d..8b6d944 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.xml
@@ -34,12 +34,12 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean,precompile">
<antcall target="compile-common">
<param name="src" value="ejb"/>
</antcall>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar:${s1as.classpath}"
destdir="${build.classes.dir}" debug="true" srcdir="client" includes="**/*.java">
<classpath path="${classpath}"/>
@@ -73,7 +73,7 @@
</antcall>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -85,7 +85,7 @@
</antcall>
<antcall target="run">
<param name="client.type" value="deploy-fail" />
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
+ <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
<param name="index" value="1" />
</antcall>
<antcall target="build-neg">
@@ -94,7 +94,7 @@
</antcall>
<antcall target="run">
<param name="client.type" value="deploy-fail" />
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
+ <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
<param name="index" value="2" />
</antcall>
</target>
@@ -110,10 +110,10 @@
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.properties
index 231faf3..393fda4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb32-methodintf"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="client.methodintf.Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.xml
index 661e787..dc898ed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,7 +51,7 @@
</antcall>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${jndiroot}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java
index 0f62d41..1af2b1c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java
@@ -25,12 +25,12 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
- public static void main(String args[]) {
+ public static void main(String args[]) {
stat.addDescription("ejb32-methodintf");
try {
@@ -40,7 +40,7 @@
stful.test();
System.out.println("Waiting timer to expire to verify the results");
Thread.sleep(3000);
- boolean pass = stles.verify() && stful.verify();
+ boolean pass = stles.verify() && stful.verify();
stat.addStatus("ejb32-methodintf: ", ((pass)? stat.PASS : stat.FAIL) );
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
index 813872c..a6a4618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
@@ -42,7 +42,7 @@
}
public boolean verifyResult() {
- return _pc && _intf;
+ return _pc && _intf;
}
@AroundInvoke
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/build.xml
index cad3814..26a3394 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/build.xml
@@ -39,9 +39,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-persistence tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-persistence tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/build.xml
index a6829c2..5062c5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/build.xml
@@ -74,9 +74,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-persistence-unsynchronizedPC tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-persistence-unsynchronizedPC tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.properties
index affb576..7da2c1a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="unsynchpc_disallowed_methods"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.xml
index 60272e2..06e9f83 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.xml
@@ -46,17 +46,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean.class,**/Tester.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Tester.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java
index e3a0692..b5245c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java
@@ -40,7 +40,7 @@
public void doTest() {
System.out.println("I am in client");
-
+
try {
Map<String, Boolean> resultMap = slessBean.doTest();
for (Entry<String, Boolean> entry : resultMap.entrySet()) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Person.java
index 83470e3..6423c1a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Person.java
@@ -24,7 +24,7 @@
@Id
private int id;
-
+
private String name;
public Person() {
@@ -33,7 +33,7 @@
public Person(String name) {
this.name = name;
}
-
+
public Person(int id) {
this.id = id;
}
@@ -42,7 +42,7 @@
public String toString() {
return "Person: {" + "(name = " + name + ")}";
}
-
+
public int getId() {
return this.id;
}
@@ -50,7 +50,7 @@
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
index 82e1b6b..e51d4c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
@@ -32,15 +32,15 @@
@PersistenceContext(unitName="lib/unsynchpc_disallowed_methods-par.jar#em",
synchronization=SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
-
+
@Override
public Map<String, Boolean> doTest() {
Map<String, Boolean> resultMap = new HashMap<String, Boolean>();
-
+
/*
* SPEC: The application's use of queries with pessimistic locks,
- * bulk update or delete queries, etc. result in the provider
- * throwing the TransactionRequiredException.
+ * bulk update or delete queries, etc. result in the provider
+ * throwing the TransactionRequiredException.
*/
//Query with pessimistic locks
Query query = em.createQuery("SELECT OBJECT(p) FROM Person p WHERE p.name='Tom'");
@@ -56,7 +56,7 @@
e.printStackTrace();
resultMap.put("TestPessimisticLockQuery", false);
}
-
+
//Bulk update
Query updateQuery = em.createQuery("UPDATE Person p SET p.name='Jim' WHERE p.id > 100");
try {
@@ -70,7 +70,7 @@
e.printStackTrace();
resultMap.put("TestBulkUpdate", false);
}
-
+
//Bulk delete
Query deleteQuery = em.createQuery("DELETE FROM Person p WHERE p.name = 'Jim'");
try {
@@ -84,12 +84,12 @@
e.printStackTrace();
resultMap.put("TestBulkDelete", false);
}
-
-
+
+
/*
- * SPEC: The application is permitted to invoke the persist, merge, remove,
- * and refresh entity lifecycle operations on an entity manager of type
- * SynchronizationType.UNSYNCHRONIZED independent of whether the
+ * SPEC: The application is permitted to invoke the persist, merge, remove,
+ * and refresh entity lifecycle operations on an entity manager of type
+ * SynchronizationType.UNSYNCHRONIZED independent of whether the
* persistence context is joined to the current transaction.
*/
Person person2 = new Person("Jack");
@@ -100,7 +100,7 @@
e.printStackTrace();
resultMap.put("TestPersist", false);
}
-
+
try {
em.merge(new Person("Lily"));
resultMap.put("TestMerge", true);
@@ -108,7 +108,7 @@
e.printStackTrace();
resultMap.put("TestMerge", false);
}
-
+
Person person3 = em.find(Person.class, 2);
person3.setName("Lucy2");
try {
@@ -118,7 +118,7 @@
e.printStackTrace();
resultMap.put("TestRefresh", false);
}
-
+
try {
em.remove(person2);
resultMap.put("TestRemove", true);
@@ -126,7 +126,7 @@
e.printStackTrace();
resultMap.put("TestRemove", false);
}
-
+
return resultMap;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.properties
index abae114..d90de98 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="unsyncpc_extendedscope_cross_sfsb"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.xml
index f0fac76..1e7df0f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.xml
@@ -46,17 +46,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Finder*.class,**/*ynchPC*.class,**/Tester.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Tester.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java
index 65a2abc..a0ce6ea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java
@@ -27,7 +27,7 @@
"appserv-tests");
@EJB(beanName = "TC1SfsbWithUnsynchPC")
private static Tester tC1SfsbWithUnsynchPC;
-
+
@EJB(beanName = "TC2SfsbWithSynchPC")
private static Tester tC2SfsbWithSynchPC;
@@ -41,13 +41,13 @@
public void doTest() {
try {
System.out.println("I am in client");
-
+
System.out.println("Calling SFSBWithUnsynchPC.doTest");
stat.addStatus("TestCase1_extendedScopeSfsbWithUnsyncPCInvokeSfsbWithSynchPC", tC1SfsbWithUnsynchPC.doTest() ? stat.PASS : stat.FAIL);
-
+
System.out.println("Calling TC2_SFSBWithSynchPC.doTest");
stat.addStatus("TestCase2_extendedScopeSfsbWithSyncPCInvokeSfsbWithUnsynchPC", tC2SfsbWithSynchPC.doTest() ? stat.PASS : stat.FAIL);
-
+
System.out.println("DoTest method ends");
} catch (Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
index c855092..25ee00e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
@@ -34,17 +34,17 @@
synchronization = SynchronizationType.SYNCHRONIZED,
type = PersistenceContextType.EXTENDED)
EntityManager em;
-
+
//@Override
public Person findPerson(String name) {
Person p = em.find(Person.class, name);
System.out.print("Find persion " + p);
return p;
}
-
+
@Init
public void createFinder() {
-
+
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
index 6c48c90..fca1ca5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
@@ -30,10 +30,10 @@
synchronization = SynchronizationType.UNSYNCHRONIZED,
type = PersistenceContextType.EXTENDED)
EntityManager em;
-
+
@EJB private TC1FinderHome finderHome;
private TC1Finder finderLocalObject;
-
+
public boolean doTest() {
try {
// Should throw EJBException here
@@ -51,6 +51,6 @@
// Unexpected exception
return false;
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
index 9628065..abe2ed7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
@@ -30,10 +30,10 @@
synchronization = SynchronizationType.SYNCHRONIZED,
type = PersistenceContextType.EXTENDED)
EntityManager em;
-
+
@EJB private TC2FinderHome finderHome;
private TC2Finder finderLocalObject;
-
+
public boolean doTest() {
try {
// Should throw EJBException here
@@ -51,6 +51,6 @@
// Unexpected exception
return false;
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
index 05decb4..3136fb1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
@@ -31,16 +31,16 @@
synchronization = SynchronizationType.UNSYNCHRONIZED,
type = PersistenceContextType.EXTENDED)
EntityManager em;
-
+
//@Override
public Person findPerson(String name) {
Person p = em.find(Person.class, name);
System.out.print("Find persion " + p);
return p;
}
-
+
@Init
public void createFinder() {
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.properties
index 10bb2ee..273101d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="unsynchpc_rollback_notclear_unsynchPC"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.xml
index 1ad30fb..7201c17 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.xml
@@ -46,17 +46,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean.class,**/Tester.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Tester.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java
index 0af4cff..c5fd2a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java
@@ -37,7 +37,7 @@
public void doTest() {
System.out.println("I am in client");
-
+
try {
stat.addStatus("TestUnsynchPCIsCLearedAfterRollback", slessBean.doTest() ? stat.PASS : stat.FAIL);
} catch (Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Person.java
index 49cecc3..ca12de1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Person.java
@@ -36,11 +36,11 @@
public String toString() {
return "Person: {" + "(name = " + name + ")}";
}
-
+
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
index 138d1cb..fcadaef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
@@ -30,26 +30,26 @@
@PersistenceContext(unitName="lib/unsynchpc_rollback_notclear_unsynchPC-par.jar#em",
synchronization=SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
-
+
@Override
public boolean doTest() {
System.out.println("I am in SlessBean.doTest");
-
+
UserTransaction utx = null;
try {
utx = (UserTransaction)(new javax.naming.InitialContext()).lookup("java:comp/UserTransaction");
utx.begin();
-
+
Person person = new Person("Tom");
em.persist(person);
-
+
//Let unsynchronized PC join the transaction;
em.joinTransaction();
-
+
System.out.println("Does PC contain person before rollback: " + em.contains(person));
utx.rollback();
System.out.println("Does PC contain person after rollback: " + em.contains(person));
-
+
return !(em.contains(person));
} catch (Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.properties
index 5be6399..d8bac62 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="unsyncpc_txscope_synctype_mismatch"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.xml
index 1296c69..04ef98f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.xml
@@ -46,17 +46,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Finder.class,**/*ynchPC*.class,**/Tester.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Tester.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java
index 0cc3be9..82dc35f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java
@@ -27,13 +27,13 @@
"appserv-tests");
@EJB(beanName = "TC1SfsbWithUnsynchPC")
private static Tester tC1SfsbWithUnsynchPC;
-
+
@EJB(beanName = "TC2SlsbWithUnsynchPC")
private static Tester tC2SlsbWithUnsynchPC;
-
+
@EJB(beanName = "TC3SlsbWithSynchPC")
private static Tester tC3SlsbWithSynchPC;
-
+
@EJB(beanName = "TC4SlsbWithSynchPC")
private static Tester tC4SlsbWithSynchPC;
@@ -47,19 +47,19 @@
public void doTest() {
try {
System.out.println("I am in client");
-
+
System.out.println("Calling tC1_SFSBWithUnsynchPC.doTest");
stat.addStatus("TestCase1_sfsbWithUnsyncPCInvokeSlsbWithSynchPC", tC1SfsbWithUnsynchPC.doTest() ? stat.PASS : stat.FAIL);
-
+
System.out.println("Calling tC2_SLSBWithUnsynchPC.doTest");
stat.addStatus("TestCase2_slsbWithUnsyncPCInvokeSlsbWithSynchPC", tC2SlsbWithUnsynchPC.doTest() ? stat.PASS : stat.FAIL);
-
+
System.out.println("Calling tC3_SLSBWithSynchPC.doTest");
stat.addStatus("TestCase3_slsbWithSyncPCInvokeSlsbWithUnsynchPC", tC3SlsbWithSynchPC.doTest() ? stat.PASS : stat.FAIL);
-
+
System.out.println("Calling tC4_SLSBWithSynchPC.doTest");
stat.addStatus("TestCase4_slsbWithSyncPCInvokeSfsbWithUnsynchPC", tC4SlsbWithSynchPC.doTest() ? stat.PASS : stat.FAIL);
-
+
System.out.println("DoTest method ends");
} catch (Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
index cce2504..84a3377 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
@@ -29,17 +29,17 @@
@PersistenceContext(unitName="lib/unsyncpc_txscope_synctype_mismatch-par.jar#em",
synchronization = SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
-
+
@EJB(beanName = "SlsbWithSynchPC")
Finder finder;
@Override
public boolean doTest() {
try {
- //FIXME: a workaround to initiate JavaEETransactionImpl.txEntityManagerMap,
+ //FIXME: a workaround to initiate JavaEETransactionImpl.txEntityManagerMap,
//so that the current PC will be associated with the current TX.
em.find(Person.class, "Tom");
-
+
System.out.println("I am in TC1SfsbWithUnsynchPC.doTest");
//expect exception thrown from finder.findPerson
finder.findPerson("Tom");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
index 5d844df..720c0f3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
@@ -29,17 +29,17 @@
@PersistenceContext(unitName="lib/unsyncpc_txscope_synctype_mismatch-par.jar#em",
synchronization = SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
-
- @EJB(beanName = "SlsbWithSynchPC")
+
+ @EJB(beanName = "SlsbWithSynchPC")
Finder finder;
-
+
@Override
public boolean doTest() {
try {
- //FIXME: a workaround to initiate JavaEETransactionImpl.txEntityManagerMap,
+ //FIXME: a workaround to initiate JavaEETransactionImpl.txEntityManagerMap,
//so that the current PC will be associated with the current TX.
em.find(Person.class, "Tom");
-
+
System.out.println("I am in TC2SlsbWithUnsynchPC.doTest");
//expect exception thrown from finder.findPerson
finder.findPerson("Tom");
@@ -56,6 +56,6 @@
return false;
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
index 3a74e1e..d419f59 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
@@ -24,14 +24,14 @@
@Stateless
public class TC3SlsbWithSynchPC implements Tester{
-
+
@PersistenceContext(unitName="lib/unsyncpc_txscope_synctype_mismatch-par.jar#em",
synchronization = SynchronizationType.SYNCHRONIZED)
EntityManager em;
-
- @EJB(beanName = "TC3SlsbWithUnSynchPC")
+
+ @EJB(beanName = "TC3SlsbWithUnSynchPC")
Finder finder;
-
+
@Override
public boolean doTest() {
try {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
index 9085481..4254ddf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
@@ -23,7 +23,7 @@
@Stateless
public class TC3SlsbWithUnSynchPC implements Finder{
-
+
@PersistenceContext(unitName="lib/unsyncpc_txscope_synctype_mismatch-par.jar#em",
synchronization = SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
index 2084d7d..29d04c2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
@@ -23,7 +23,7 @@
@Stateful
public class TC4SfsbWithUnsynchPC implements Finder{
-
+
@PersistenceContext(unitName="lib/unsyncpc_txscope_synctype_mismatch-par.jar#em",
synchronization = SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
index d50c70d..326507f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
@@ -28,10 +28,10 @@
@PersistenceContext(unitName="lib/unsyncpc_txscope_synctype_mismatch-par.jar#em",
synchronization = SynchronizationType.SYNCHRONIZED)
EntityManager em;
-
+
@EJB(beanName = "TC4SfsbWithUnsynchPC")
Finder finder;
-
+
@Override
public boolean doTest() {
try {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.properties
index 80d0948..422163f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="unsynchpc_flush"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.xml
index 77e288c..05be76f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.xml
@@ -46,17 +46,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*ynchPC*.class,**/Tester.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Tester.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java
index 6ed9ff8..200669f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java
@@ -40,22 +40,22 @@
System.out.println("I am in client");
System.out.println("Calling SLSBWithUnsynchPC.flushBeforeJoin");
- stat.addStatus("FlushUnsyncPCBeforeJoin", sLSBWithUnsynchPC.flushBeforeJoin() ?
+ stat.addStatus("FlushUnsyncPCBeforeJoin", sLSBWithUnsynchPC.flushBeforeJoin() ?
stat.PASS : stat.FAIL);
-
+
System.out.println("Calling SLSBWithUnsynchPC.flushAfterJoin");
- stat.addStatus("FlushUnsyncPCAfterJoin", sLSBWithUnsynchPC.flushAfterJoin() ?
+ stat.addStatus("FlushUnsyncPCAfterJoin", sLSBWithUnsynchPC.flushAfterJoin() ?
stat.PASS : stat.FAIL);
-
- /* SPEC: If the flush method is not explicitly invoked, the persistence provider
- * may defer flushing until commit time depending on the operations invoked and
+
+ /* SPEC: If the flush method is not explicitly invoked, the persistence provider
+ * may defer flushing until commit time depending on the operations invoked and
* the flush mode setting in effect.
*/
System.out.println("Calling SLSBWithUnsynchPC.AutoFlushByProvider");
sLSBWithUnsynchPC.autoFlushByProvider("Tom3");
- stat.addStatus("AutoFlushByProvider", sLSBWithUnsynchPC.isPersonFound("Tom3") ?
+ stat.addStatus("AutoFlushByProvider", sLSBWithUnsynchPC.isPersonFound("Tom3") ?
stat.PASS : stat.FAIL);
-
+
System.out.println("DoTest method ends");
} catch (Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
index b80cc3c..eb50e89 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
@@ -32,10 +32,10 @@
@Override
public boolean flushBeforeJoin() {
System.out.println("I am in flushBeforeJoin");
-
+
Person p = new Person("Tom");
em.persist(p);
-
+
try {
System.out.println("is jonined before flush: " + em.isJoinedToTransaction());
//flush before the unsynchronized PC join transaction
@@ -43,7 +43,7 @@
System.out.println("flushed with no exceptions thrown");
return false;
} catch (TransactionRequiredException tre) {
- /* SPEC: A persistence context of type SynchronizationType.UNSYNCHRONIZED must
+ /* SPEC: A persistence context of type SynchronizationType.UNSYNCHRONIZED must
* not be flushed to the database unless it is joined to a transaction
*/
//Expected exception thrown
@@ -54,7 +54,7 @@
return false;
}
}
-
+
@Override
public boolean flushAfterJoin() {
System.out.println("I am in flushAfterJoin");
@@ -67,8 +67,8 @@
em.joinTransaction();
try {
System.out.println("is jonined before flush: " + em.isJoinedToTransaction());
- /* SPEC: After the persistence context has been joined to a transaction,
- * changes in a persistence context can be flushed to the database explicitly
+ /* SPEC: After the persistence context has been joined to a transaction,
+ * changes in a persistence context can be flushed to the database explicitly
* by the application
*/
em.flush();
@@ -79,19 +79,19 @@
return false;
}
}
-
+
@Override
public void autoFlushByProvider(String name) {
System.out.println("I am in autoFlushByProvider");
-
+
Person p = new Person(name);
em.persist(p);
-
+
System.out.println("is jonined before joinTransaction: " + em.isJoinedToTransaction());
//Join transaction
em.joinTransaction();
}
-
+
@Override
public boolean isPersonFound(String name) {
System.out.println("I am in isPersonFound");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java
index c3a048b..6c76c47 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java
@@ -21,10 +21,10 @@
@Remote
public interface Tester {
public boolean flushBeforeJoin();
-
+
public boolean flushAfterJoin();
-
+
public void autoFlushByProvider(String name);
-
+
public boolean isPersonFound(String name);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.properties
index 08fbf2c..3253ce4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="unsynchpc_use_nonjtadatasource"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.xml
index c4da180..e29a505 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.xml
@@ -46,17 +46,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean.class,**/Tester.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Tester.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Person.java
index aba6a34..c6fe1ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Person.java
@@ -24,7 +24,7 @@
@Id
private int id;
-
+
private String name;
public Person() {
@@ -38,7 +38,7 @@
public String toString() {
return "Person: {" + "(name = " + name + ")}";
}
-
+
public int getId() {
return this.id;
}
@@ -46,7 +46,7 @@
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
index 5b455b1..b92ae2e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
@@ -28,18 +28,18 @@
@Stateful
public class SfulBean {
@PersistenceContext(unitName="lib/unsynchpc_use_nonjtadatasource-par.jar#em",
- type=PersistenceContextType.EXTENDED,
+ type=PersistenceContextType.EXTENDED,
synchronization=SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
-
+
public Person testUsingNonJTADataSource(Map<String, Boolean> resultMap) {
Person p = em.find(Person.class, 1);
System.out.println("I am in testUsingNonJTADataSource, and person name is " + p.getName());
resultMap.put("equalsCurrentName", p.getName().equals("currentName"));
return p;
}
-
+
public boolean testRollBackDoesNotClearUnsynchPC(Person person) {
- return (em.contains(person) && person.getName() != "newName");
+ return (em.contains(person) && person.getName() != "newName");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java
index eb6578b..cf361c5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java
@@ -31,14 +31,14 @@
import jakarta.transaction.UserTransaction;
@Stateless
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.use_nonjtadatasource.ejb.SfulBean.class)
@TransactionManagement(TransactionManagementType.BEAN)
public class SlessBean implements Tester{
-
+
public Map<String, Boolean> doTest() {
Map<String, Boolean> resultMap = new HashMap<String, Boolean>();
-
+
DataSource ds = null;
Connection conn = null;
PreparedStatement ps = null;
@@ -48,23 +48,23 @@
utx = (UserTransaction)(new javax.naming.InitialContext()).lookup("java:comp/UserTransaction");
ds = (DataSource)(new javax.naming.InitialContext()).lookup("java:comp/DefaultDataSource");
-
+
utx.begin();
conn = ds.getConnection();
ps = conn.prepareStatement("Update EJB32_PERSISTENCE_CONTEXT_PERSON set name = 'newName' where id = 1");
-
+
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
SfulBean sfulBean = (SfulBean) initCtx.lookup(lookupName);
-
+
Person person = sfulBean.testUsingNonJTADataSource(resultMap);
-
+
utx.rollback();
utx = null;
resultMap.put("testRollBackDoesNotClearUnsynchPC", sfulBean.testRollBackDoesNotClearUnsynchPC(person));
-
+
System.out.println("DoTest method ends");
return resultMap;
} catch (Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.properties
index 95b5cd3..232412c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb32-sfsb-basic"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.xml
index cfb926f..4e4e6e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Foo*.class,**/Hell*.class,**/S*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
index e75bfb7..48d0368 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
@@ -29,17 +29,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -47,26 +47,26 @@
public void doTest() {
- try {
+ try {
- Hello bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB!com.acme.Hello");
- System.out.println("SFSB test : " + bean.test("BAR", 1));
+ Hello bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB!com.acme.Hello");
+ System.out.println("SFSB test : " + bean.test("BAR", 1));
bean.testRemove();
- bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB!com.acme.Hello");
- System.out.println("SFSB test destroyed: " + bean.test("FOO", 1));
- System.out.println("SFSB test again: " + bean.test("BAR", 2));
+ bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB!com.acme.Hello");
+ System.out.println("SFSB test destroyed: " + bean.test("FOO", 1));
+ System.out.println("SFSB test again: " + bean.test("BAR", 2));
- Hello2 bean2 = (Hello2) new InitialContext().lookup("java:global/" + appName + "/SLSB");
+ Hello2 bean2 = (Hello2) new InitialContext().lookup("java:global/" + appName + "/SLSB");
bean2.testRemove();
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/FooEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/FooEntity.java
index 2bdd2ab..8f44c96 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/FooEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/FooEntity.java
@@ -24,8 +24,8 @@
@Entity
public class FooEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -33,10 +33,10 @@
public FooEntity(String name) {
setName(name);
}
-
+
public FooEntity() {
}
-
+
public String getName() {
return name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
index a996a05..e75325b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
@@ -39,16 +39,16 @@
em.persist(fe);
System.out.println("Done SFSB::init()");
}
-
+
public String test(String value, int count) throws EJBException {
- System.out.println("In SFSB::test()");
+ System.out.println("In SFSB::test()");
Query q = em.createQuery("SELECT f FROM FooEntity f WHERE f.name=:name");
q.setParameter("name", value);
- java.util.List result = q.getResultList();
- if (result.size() != count)
+ java.util.List result = q.getResultList();
+ if (result.size() != count)
throw new EJBException("ERROR: Found " + result.size() + " FooEntity named " + value + ", not expected " + count);
- return "Found " + result.size() + " FooEntity named " + value;
+ return "Found " + result.size() + " FooEntity named " + value;
}
@Remove
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java
index 9df1d86..65bfe3d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java
@@ -26,13 +26,13 @@
public void testRemove() {
System.out.println("In SLSB::testRemove()");
- bean.test("XYZ", 0);
+ bean.test("XYZ", 0);
bean.testRemove();
try {
- bean.foo();
- throw new RuntimeException("Removed bean got invoked!");
+ bean.foo();
+ throw new RuntimeException("Removed bean got invoked!");
} catch(NoSuchEJBException nse) {
- System.out.println("SFSB has been removed, subsequent invocation got exception");
+ System.out.println("SFSB has been removed, subsequent invocation got exception");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SuperSFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SuperSFSB.java
index 65d6703..6758a79 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SuperSFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SuperSFSB.java
@@ -17,7 +17,7 @@
package com.acme;
public class SuperSFSB {
- public void foo() {
- return;
- }
+ public void foo() {
+ return;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/build.xml
index 0f7b1ce..ebb6f20 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/build.xml
@@ -53,9 +53,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-sfsb tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-sfsb tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.properties
index f31d1d5..970ef84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb32-sfsb-descr"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.xml
index 0bf662d..97e57bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Foo*.class,**/Hello.class,**/SFSB.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
index b09b63f..128e3f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
@@ -29,17 +29,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -47,22 +47,22 @@
public void doTest() {
- try {
+ try {
- Hello bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB");
- System.out.println("SFSB test : " + bean.test("BAR", 1));
+ Hello bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB");
+ System.out.println("SFSB test : " + bean.test("BAR", 1));
bean.testRemove();
- bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB");
- System.out.println("SFSB test destroyed: " + bean.test("FOO", 1));
- System.out.println("SFSB test again: " + bean.test("BAR", 2));
+ bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB");
+ System.out.println("SFSB test destroyed: " + bean.test("FOO", 1));
+ System.out.println("SFSB test again: " + bean.test("BAR", 2));
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/FooEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/FooEntity.java
index 2bdd2ab..8f44c96 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/FooEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/FooEntity.java
@@ -24,8 +24,8 @@
@Entity
public class FooEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -33,10 +33,10 @@
public FooEntity(String name) {
setName(name);
}
-
+
public FooEntity() {
}
-
+
public String getName() {
return name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
index a74ef21..3d4c3cd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
@@ -34,16 +34,16 @@
em.persist(fe);
System.out.println("Done SFSB::init()");
}
-
+
public String test(String value, int count) throws EJBException {
- System.out.println("In SFSB::test()");
+ System.out.println("In SFSB::test()");
Query q = em.createQuery("SELECT f FROM FooEntity f WHERE f.name=:name");
q.setParameter("name", value);
- java.util.List result = q.getResultList();
- if (result.size() != count)
+ java.util.List result = q.getResultList();
+ if (result.size() != count)
throw new EJBException("ERROR: Found " + result.size() + " FooEntity named " + value + ", not expected " + count);
- return "Found " + result.size() + " FooEntity named " + value;
+ return "Found " + result.size() + " FooEntity named " + value;
}
public void testRemove() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.properties
index b5ac995..eda4a85 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb32-sfsb-lifecycle_cb_txattr"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.xml
index 0930eec..6c87af9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/H*.class,**/S*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
index 5bfa4db..18b14ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
@@ -29,17 +29,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
index 1bcf730..ec45175 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
@@ -34,9 +34,9 @@
System.out.println("In SFSB::init()");
(new Exception("init")).printStackTrace();
}
-
+
public String test() throws EJBException {
- System.out.println("In SFSB::test()");
+ System.out.println("In SFSB::test()");
return "SFSB";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
index 68b543d..6fbe6ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
@@ -33,9 +33,9 @@
public void init() {
System.out.println("In SFSB1::init()");
}
-
+
public String test() throws EJBException {
- System.out.println("In SFSB1::test()");
+ System.out.println("In SFSB1::test()");
return "SFSB1";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
index e7b9e7d..80522a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
@@ -33,9 +33,9 @@
public void init() {
System.out.println("In SFSB2::init()");
}
-
+
public String test() throws EJBException {
- System.out.println("In SFSB2::test()");
+ System.out.println("In SFSB2::test()");
return "SFSB2";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/build.xml
index 19f2bed..6762b46 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/build.xml
@@ -48,13 +48,13 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-timer tests)
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-timer tests)
- ant getalltimers (Executes the getAllTimers ejb-timer test)
- ant opallowed (Executes the operation allowed ejb-timer test)
+ ant getalltimers (Executes the getAllTimers ejb-timer test)
+ ant opallowed (Executes the operation allowed ejb-timer test)
- </echo>
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.properties
index c0f5946..c9e87df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-getalltimers"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.xml
index e7fb279..242130a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -60,9 +60,9 @@
<param name="appclientjar.classes" value="**/Client.class,**/*Timeout.class" />
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -70,10 +70,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java
index e39c707..61b0f0a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java
@@ -23,7 +23,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
@@ -33,7 +33,7 @@
@EJB(lookup = "java:app/ejb-timer-getalltimers-ejb2/StlesNonTimeoutEJB")
private static StlesNonTimeout stlesNonTimeout;
- public static void main(String args[]) {
+ public static void main(String args[]) {
stat.addDescription("ejb32-timer-getalltimers");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java
index a0f64f0..5caa0dd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java
@@ -65,7 +65,7 @@
errors.add(info);
}
}
-
+
if (ts.size() != expected_infos.size()) {
printTimerInfos(ts);
throw new EJBException("timerSvc.getAllTimers().size() = "
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.properties
index 75a0679..df41644 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.properties
@@ -15,15 +15,15 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-opallowed"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="com.acme.ejb32.timer.opallowed.Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="appclient"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.xml
index db50247..07bf7ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.xml
@@ -34,19 +34,19 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<!--this is tricky since webclient-war-common simply package all classes under ${war.classes}
and we need remote/local interface in the war-->
- <copy todir="war">
- <fileset dir="ejb" includes="**/*Timeout.java,**/*TimeoutLocal.java"/>
- </copy>
+ <copy todir="war">
+ <fileset dir="ejb" includes="**/*Timeout.java,**/*TimeoutLocal.java"/>
+ </copy>
<antcall target="compile-common">
<param name="src" value="war"/>
</antcall>
<delete>
- <fileset dir="war" includes="**/*Timeout.java,**/*TimeoutLocal.java"/>
- </delete>
+ <fileset dir="war" includes="**/*Timeout.java,**/*TimeoutLocal.java"/>
+ </delete>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="true"/>
</antcall>
@@ -69,58 +69,58 @@
<param name="appclientjar.classes" value="**/Client.class,**/*Timeout.class" />
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
- <!--run-appclient & run-jseclient are blocked by JIRA19546-->
+ <!--run-appclient & run-jseclient are blocked by JIRA19546-->
<target name="run" depends="run-pojo, run-webapp, run-managedbean"/>
- <target name="run-appclient" depends="init-common">
- <antcall target="runclient-common"/>
- </target>
-
- <target name="run-jseclient" depends="init-common">
+ <target name="run-appclient" depends="init-common">
+ <antcall target="runclient-common"/>
+ </target>
+
+ <target name="run-jseclient" depends="init-common">
<antcall target="run-client">
<param name="client.type" value="jseClient" />
</antcall>
- </target>
+ </target>
- <target name="run-client">
- <java fork="on"
+ <target name="run-client">
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${test.client}">
- <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
+ <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
<arg line="${client.type}"/>
<arg line="${http.port}"/>
</java>
- </target>
+ </target>
- <target name="run-pojo" depends="init-common">
+ <target name="run-pojo" depends="init-common">
<antcall target="run-client">
<param name="client.type" value="pojo" />
</antcall>
- </target>
+ </target>
- <target name="run-webapp" depends="init-common">
+ <target name="run-webapp" depends="init-common">
<antcall target="run-client">
<param name="client.type" value="webapp" />
</antcall>
- </target>
+ </target>
- <target name="run-managedbean" depends="init-common">
+ <target name="run-managedbean" depends="init-common">
<antcall target="run-client">
<param name="client.type" value="managedbean" />
</antcall>
- </target>
+ </target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java
index 045234c..0089ff2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java
@@ -31,9 +31,9 @@
public class SingletonTimeoutEJB implements SingletonTimeoutLocal, SingletonTimeout {
@Resource
TimerService ts;
-
+
Timer t;
-
+
public TimerHandle createTimer(String info) {
boolean created = false;
for(Timer timer:ts.getTimers()) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java
index 4b5894b..ed51514 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java
@@ -42,7 +42,7 @@
String type = req.getQueryString();
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
out.println("<html>");
out.println("<head>");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejbc/build.xml
index 2c3af5b..0f87e0f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/build.xml
@@ -53,13 +53,13 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant equals (Executes the ejb-ejbc equals test)
- ant redef (Executes the ejb-ejbc redef test)
- ant sameimpl (Executes the ejb-ejbc sameimpl
+ <echo>
+ Usage:
+ ant equals (Executes the ejb-ejbc equals test)
+ ant redef (Executes the ejb-ejbc redef test)
+ ant sameimpl (Executes the ejb-ejbc sameimpl
test)
- ant all (Executes all the ejb-ejbc tests)
- </echo>
+ ant all (Executes all the ejb-ejbc tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.properties
index 5b233db..33e1fcc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejbc-equals"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.xml
index ab750aa..c06099a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/Hello.class,**/HelloHome.class,**/*Foo*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,17 +61,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="redeploy" depends="init-common">
<antcall target="deploy-common"/>
<antcall target="deploy-common"/>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java
index 397a553..454e93e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java
@@ -32,7 +32,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -41,22 +41,22 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejbc-equalsID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/foo");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
@@ -65,13 +65,13 @@
// make sure stubs for super class are available to client
FooHomeSuper homeSuper = (FooHomeSuper)
PortableRemoteObject.narrow(objref, FooHomeSuper.class);
-
+
System.err.println("Narrowed FooHomeSuper!!");
-
-
+
+
Foo f = home.create();
System.err.println("Got the EJB!!");
- f.callHello();
+ f.callHello();
FooSuper f2 = home.create();
f2.louie();
@@ -82,10 +82,10 @@
stat.addStatus("ejbclient main" , stat.FAIL);
}
- try {
+ try {
Context ic = new InitialContext();
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
@@ -93,30 +93,30 @@
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
String said = hr.sayHello();
String result = hr.assertValidRemoteObject();
if (result == null) {
- stat.addStatus("ejbclient assertValidRemoteObject", stat.PASS);
- } else {
- System.out.println("assertValidRemoteObject: " + result);
- stat.addStatus("ejbclient assertValidRemoteObject", stat.FAIL);
- }
+ stat.addStatus("ejbclient assertValidRemoteObject", stat.PASS);
+ } else {
+ System.out.println("assertValidRemoteObject: " + result);
+ stat.addStatus("ejbclient assertValidRemoteObject", stat.FAIL);
+ }
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("ejbclient assertValidRemoteObject" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java
index 8f1c9d2..44b6f06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java
@@ -24,7 +24,7 @@
public interface Foo extends EJBObject, FooSuper, java.rmi.Remote {
void callHello() throws RemoteException;
String sayHello() throws RemoteException;
-
+
public boolean assertValidRemoteObject(String msg)
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java
index 555fe48..0646997 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,11 +33,11 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void louie() { System.out.println("luigi luigi"); }
@@ -69,22 +69,22 @@
FooLocalHome fooLocalHome = (FooLocalHome)
ic.lookup("java:comp/env/ejb/melocal");
FooLocal meLocal = fooLocalHome.create();
-
+
System.out.println("Looking up ejb ref hello ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
hr.sayHello();
@@ -98,10 +98,10 @@
HelloLocalHome localHome = (HelloLocalHome)
ic.lookup("java:comp/env/ejb/hellolocal");
System.err.println("Looked up home!!");
-
+
HelloLocal hl = localHome.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
hl.sayHello();
@@ -112,7 +112,7 @@
//
System.out.println("Looking up ejb ref hello ");
- // create EJB using factory from container
+ // create EJB using factory from container
objref = ic.lookup("java:comp/env/ejb/hello2");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
@@ -120,12 +120,12 @@
HelloHome home2 = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr2 = home2.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
String said = hr2.sayHello();
@@ -137,10 +137,10 @@
HelloLocalHome localHome2 = (HelloLocalHome)
ic.lookup("java:comp/env/ejb/hellolocal2");
System.err.println("Looked up home!!");
-
+
HelloLocal hl2 = localHome2.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello2 ejb");
String saidLocal = hl2.sayHello();
@@ -155,7 +155,7 @@
}
- com.sun.ejb.Container cont =
+ com.sun.ejb.Container cont =
((com.sun.ejb.containers.EJBContextImpl) sc).getContainer();
//
@@ -281,22 +281,22 @@
Context ic = new InitialContext();
System.out.println("Looking up ejb ref hello ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
Hello hr = home.create();
- return (hr.assertValidRemoteObject() == null)
- ? true: false;
- } catch (Exception ex) {
- throw new EJBException(ex);
- }
+ return (hr.assertValidRemoteObject() == null)
+ ? true: false;
+ } catch (Exception ex) {
+ throw new EJBException(ex);
+ }
}
public String assertValidRemoteObject() {
@@ -306,10 +306,10 @@
Context ic = new InitialContext();
Object objref = ic.lookup("java:comp/env/ejb/hello2");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
Hello hr2 = home.create();
hr2.sayHello();
@@ -317,7 +317,7 @@
System.out.println("successfully invoked sayHello() ejb2");
//
- com.sun.ejb.Container cont =
+ com.sun.ejb.Container cont =
((com.sun.ejb.containers.EJBContextImpl) sc).getContainer();
//
@@ -336,8 +336,8 @@
try {
cont.assertValidRemoteObject(home);
String str = "Comparison of (ejbo and home) should have failed";
- System.out.println(str);
- return str;
+ System.out.println(str);
+ return str;
} catch(jakarta.ejb.EJBException e) {
System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
}
@@ -345,8 +345,8 @@
try {
cont.assertValidRemoteObject(null);
String str = "Comparison of (ejbo and null) should have failed";
- System.out.println(str);
- return str;
+ System.out.println(str);
+ return str;
} catch(jakarta.ejb.EJBException e) {
System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
}
@@ -354,8 +354,8 @@
try {
cont.assertValidRemoteObject(this);
String str = "Comparison of (ejbo and bean) should have failed";
- System.out.println(str);
- return str;
+ System.out.println(str);
+ return str;
} catch(jakarta.ejb.EJBException e) {
System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
}
@@ -363,18 +363,18 @@
try {
cont.assertValidRemoteObject(hr2);
String str = "Comparison of (ejbo and ejbo_from_diff_container) should have failed";
- System.out.println(str);
- return str;
+ System.out.println(str);
+ return str;
} catch(jakarta.ejb.EJBException e) {
System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
}
- return null;
- } catch (Exception ex) {
- ex.printStackTrace();
- return "Caught unexpected exception: " + ex.toString();
- }
+ return null;
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ return "Caught unexpected exception: " + ex.toString();
+ }
}
public void ejbRemove() throws RemoteException {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuper.java
index abb4dd5..4152e62 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuper.java
@@ -20,5 +20,5 @@
import java.rmi.RemoteException;
public interface FooHomeSuper extends java.rmi.Remote {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java
index b4eb94f..ceda6d6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java
@@ -27,6 +27,6 @@
String sayHello() throws RemoteException;
String assertValidRemoteObject()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.properties
index faa6943..30ddd37 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejbc-redef"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.xml
index 2055da0..04c272d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java
index 4a8ce18..e88e5a5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,31 +37,31 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejbc-redefID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/foo");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Foo f = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
f.callHello();
@@ -75,8 +75,8 @@
e.printStackTrace();
stat.addStatus("ejbclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java
index 71580c9..28b565a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,11 +33,11 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public String sayHello() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java
index eb0530c..642bd9c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java
@@ -23,6 +23,6 @@
public interface FooHomeSuper extends Remote {
-
+
Foo create() throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.properties
index fdce939..043bb24 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejbc-sameimpl"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.xml
index 6e73fd8..8ca7e4d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo.class,**/*FooHome.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java
index 9b5f3e8..6cdc44a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,31 +37,31 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejbc-sameimplID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/foo");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Foo f = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
f.callHello();
@@ -73,8 +73,8 @@
e.printStackTrace();
stat.addStatus("ejbclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java
index 4b705ee..b61b739 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,11 +33,11 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public String sayHello() {
@@ -62,21 +62,21 @@
Context ic = new InitialContext();
//
-
+
System.out.println("Looking up ejb ref hello ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
hr.sayHello();
@@ -90,10 +90,10 @@
HelloLocalHome localHome = (HelloLocalHome)
ic.lookup("java:comp/env/ejb/hellolocal");
System.err.println("Looked up home!!");
-
+
HelloLocal hl = localHome.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
hl.sayHello();
@@ -104,19 +104,19 @@
//
System.out.println("Looking up ejb ref hello ");
- // create EJB using factory from container
+ // create EJB using factory from container
objref = ic.lookup("java:comp/env/ejb/hello2");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home2 = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr2 = home2.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
String said = hr2.sayHello();
@@ -128,10 +128,10 @@
HelloLocalHome localHome2 = (HelloLocalHome)
ic.lookup("java:comp/env/ejb/hellolocal2");
System.err.println("Looked up home!!");
-
+
HelloLocal hl2 = localHome2.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello2 ejb");
String saidLocal = hl2.sayHello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/build.xml b/appserver/tests/appserv-tests/devtests/ejb/jms/build.xml
index 6c1ea32..46abcd0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/build.xml
@@ -45,11 +45,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant jmsejb (Executes the ejb-jms jmsejb test)
- ant jmsejb2 (Executes the ejb-jms jmsejb2 test)
- ant all (Executes all the ejb-jms tests)
- </echo>
+ <echo>
+ Usage:
+ ant jmsejb (Executes the ejb-jms jmsejb test)
+ ant jmsejb2 (Executes the ejb-jms jmsejb2 test)
+ ant all (Executes all the ejb-jms tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.properties
index 62739da..a2fa85b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-jms-jmsejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.xml
index 0cdc6a6..85a3c38 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/HelloHome.class,**/Hello.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -73,14 +73,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java
index 589c4f3..8cc21ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -33,11 +33,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-mdb-jmsejbID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
String ejbNames[] = { "ejbs/hellobmt", "ejbs/hellocmt" };
@@ -45,56 +45,56 @@
try {
for(int i = 0; i < ejbNames.length; i++ ) {
ejbName = ejbNames[i];
-
+
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref " + ejbName);
- // create EJB using factory from container
+ // create EJB using factory from container
// java.lang.Object objref = ic.lookup("helloApp/Hello");
java.lang.Object objref = ic.lookup("java:comp/env/"+ejbName);
System.out.println("---ejb stub---" + objref.getClass().getClassLoader());
System.out.println("---ejb classname---" + objref.getClass().getName());
System.out.println("---HelloHome---" + HelloHome.class.getClassLoader());
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow(
objref, HelloHome.class);
System.err.println("Narrowed home!!");
-
-
+
+
Hello hr = home.create(helloStr);
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("Asking ejb to send a message");
String msgText = "Look ma, I received a JMS message!!!";
-
+
//
String result = hr.sendMessage1(msgText);
System.out.println("Result from sendMessage = " + result);
System.out.println("Asking ejb to receive a message");
hr.receiveMessage1();
-
+
//
result = hr.sendMessage2(msgText);
System.out.println("Result from sendMessage = " + result);
System.out.println("Asking ejb to receive a message");
hr.receiveMessage2();
-
+
//
result = hr.sendMessage3(msgText);
System.out.println("Result from sendMessage = " + result);
System.out.println("Asking ejb to receive a message");
hr.receiveMessage3();
-
- /* comment out
+
+ /* comment out
hr.sendMessage4Part1(msgText);
hr.sendMessage4Part2(msgText);
hr.receiveMessage4Part1();
hr.receiveMessage4Part2();
*/
-
+
hr.sendAndReceiveMessage();
hr.sendAndReceiveRollback();
@@ -103,15 +103,15 @@
hr.sendMessageRollback(msgText + "rollback");
hr.receiveMessageRollback();
- stat.addStatus("jmsejb " + ejbName,
+ stat.addStatus("jmsejb " + ejbName,
stat.PASS);
}
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("jmsejb " + ejbName, stat.FAIL);
}
-
- return;
+
+ return;
}
final static String helloStr = "Hello World!";
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
index 7e7f4d6..9d039a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.jms.jmsejb;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -35,7 +35,7 @@
public HelloBean() {}
public void ejbCreate(String str) throws RemoteException {
- System.out.println("In ejbCreate !!");
+ System.out.println("In ejbCreate !!");
this.str = str;
try {
Context context = new InitialContext();
@@ -47,13 +47,13 @@
System.out.println("HelloEJB has CONTAINER MANAGED TX");
}
- String name = (String) context.lookup("java:comp/env/user");
- Double d = (Double) context.lookup("java:comp/env/number");
- System.out.println("Hello EJB - saying hello to " + name +
- ",number is " + d);
+ String name = (String) context.lookup("java:comp/env/user");
+ Double d = (Double) context.lookup("java:comp/env/number");
+ System.out.println("Hello EJB - saying hello to " + name +
+ ",number is " + d);
queue = (Queue) context.lookup("java:comp/env/jms/QueueName");
- qcFactory =
+ qcFactory =
(QueueConnectionFactory) context.lookup("java:comp/env/jms/MyQueueConnectionFactory");
} catch(Exception e) {
@@ -100,7 +100,7 @@
sc.getUserTransaction().commit();
}
- // Now make sure that even though the global transaction
+ // Now make sure that even though the global transaction
// is over, calling commit results in an exception.
// since we're in an ejb.
try {
@@ -152,7 +152,7 @@
} catch(jakarta.jms.JMSException j2) {
throw new JMSException("Got wrong jmsexception");
}
-
+
try {
session.getMessageListener();
throw new JMSException
@@ -186,7 +186,7 @@
QueueSession session = connection.createQueueSession(true, 0);
sendMessageInternal(session, msg);
-
+
session.close();
if( beanManagedTx ) {
@@ -213,7 +213,7 @@
}
/**
- * Create a session and store it as part of
+ * Create a session and store it as part of
* the ejb's state. Then send a message.
* Corresponding recv method will close the session.
*/
@@ -247,7 +247,7 @@
}
} catch(Exception ne) {}
throw new EJBException(e);
- }
+ }
return msg;
}
@@ -259,7 +259,7 @@
QueueConnection connection = null;
try {
connection = qcFactory.createQueueConnection();
-
+
QueueSession session = connection.createQueueSession(true, 0);
if( beanManagedTx ) {
@@ -302,7 +302,7 @@
}
connection = qcFactory.createQueueConnection();
-
+
QueueSession session = connection.createQueueSession(true, 0);
connection.start();
@@ -374,7 +374,7 @@
/**
* Send a message but don't commit. sendMessagePart2
* will commit. This method will only work with
- * when bean has bean managed tx.
+ * when bean has bean managed tx.
*/
public String sendMessage4Part1(String msg) throws EJBException {
try {
@@ -386,7 +386,7 @@
}
savedConnection = qcFactory.createQueueConnection();
-
+
savedSession = savedConnection.createQueueSession(true, 0);
sendMessageInternal(savedSession, msg);
@@ -404,7 +404,7 @@
}
} catch(Exception ne) {}
throw new EJBException(e);
- }
+ }
return msg;
}
@@ -434,7 +434,7 @@
}
} catch(Exception ne) {}
throw new EJBException(e);
- }
+ }
return msg;
}
@@ -447,9 +447,9 @@
System.out.println("In sendMessageRollback");
if( beanManagedTx ) {
sc.getUserTransaction().begin();
- }
+ }
savedConnection = qcFactory.createQueueConnection();
-
+
savedSession = savedConnection.createQueueSession(true, 0);
sendMessageInternal(savedSession, msg);
@@ -473,7 +473,7 @@
}
} catch(Exception ne) {}
throw new EJBException(e);
- }
+ }
return msg;
}
@@ -489,7 +489,7 @@
Message message = receiver.receiveNoWait();
if( message != null ) {
- throw new Exception("Shouldn't have gotten msg " +
+ throw new Exception("Shouldn't have gotten msg " +
message);
} else {
System.out.println("Successfully DIDN'T receive msg");
@@ -510,7 +510,7 @@
/**
* Receive a message but don't commit. recvMessagePart2
* will commit. This method will only work with
- * when bean has bean managed tx.
+ * when bean has bean managed tx.
*/
public void receiveMessage4Part1() throws EJBException {
try {
@@ -520,7 +520,7 @@
System.out.println("skipping recvMessage4Part1 b/c of CMT");
return;
}
-
+
savedConnection.start();
Message message = recvMessageInternal(savedSession);
@@ -538,9 +538,9 @@
}
} catch(Exception ne) {}
throw new EJBException(e);
- }
+ }
}
-
+
/**
* Commit the receive that was done in recvMessagePart1
*/
@@ -586,21 +586,21 @@
}
connection = qcFactory.createQueueConnection();
-
+
QueueSession session = connection.createQueueSession(true, 0);
String msgText = "sendandreceive";
sendMessageInternal(session, msgText);
sc.getUserTransaction().commit();
System.out.println("Sent message " + msgText);
-
+
//
connection.start();
sc.getUserTransaction().begin();
recvMessageInternal(session);
sc.getUserTransaction().commit();
-
+
} catch(Exception e) {
e.printStackTrace();
try {
@@ -631,7 +631,7 @@
}
connection = qcFactory.createQueueConnection();
-
+
QueueSession session = connection.createQueueSession(true, 0);
String msgText = "sendandreceiverollback";
@@ -685,7 +685,7 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void ejbRemove() throws RemoteException {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.properties b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.properties
index 922932e..1451275 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-jms-jmsejb2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.xml b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.xml
index f22c24f..33fbb0c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/HelloHome.class,**/Hello.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -73,14 +73,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java
index d298129..2d7fdff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -33,43 +33,43 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-mdb-jmsejb2ID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
String ejbName = "ejbs/hellobmt";
try {
-
+
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref " + ejbName);
- // create EJB using factory from container
+ // create EJB using factory from container
java.lang.Object objref = ic.lookup("java:comp/env/"+ejbName);
- System.out.println("---ejb stub---" +
+ System.out.println("---ejb stub---" +
objref.getClass().getClassLoader());
- System.out.println("---ejb classname---" +
+ System.out.println("---ejb classname---" +
objref.getClass().getName());
- System.out.println("---HelloHome---" +
+ System.out.println("---HelloHome---" +
HelloHome.class.getClassLoader());
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create(helloStr);
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("Asking ejb to send a message");
String msgText = "this is the ejb-jms-jmsejb2 test";
-
+
String result = hr.sendMessageNoCommitPart1(msgText);
System.out.println("Result from sendMessage = " + result);
@@ -82,8 +82,8 @@
e.printStackTrace();
stat.addStatus("jmsejb2 " + ejbName, stat.FAIL);
}
-
- return;
+
+ return;
}
final static String helloStr = "Hello World!";
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
index 20aeeeb..ec477c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.jms.jmsejb2;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -34,7 +34,7 @@
public HelloBean() {}
public void ejbCreate(String str) throws RemoteException {
- System.out.println("In ejbCreate !!");
+ System.out.println("In ejbCreate !!");
this.str = str;
try {
Context context = new InitialContext();
@@ -43,7 +43,7 @@
queue = (Queue) context.lookup("java:comp/env/jms/QueueName");
- qcFactory = (QueueConnectionFactory)
+ qcFactory = (QueueConnectionFactory)
context.lookup("java:comp/env/jms/MyQueueConnectionFactory");
} catch(Exception e) {
@@ -75,7 +75,7 @@
throw new EJBException(e);
}
- // NOTE : leave connection and session open. they will be
+ // NOTE : leave connection and session open. they will be
// re-enlisted when the next business method is called since
// the transaction is still active.
@@ -122,7 +122,7 @@
}
}
- private void sendMessageInternal(QueueSession session, String msg)
+ private void sendMessageInternal(QueueSession session, String msg)
throws JMSException {
// Create a message producer.
QueueSender sender = session.createSender(queue);
@@ -133,7 +133,7 @@
sender.send(message);
}
- private Message recvMessageInternal(QueueSession session)
+ private Message recvMessageInternal(QueueSession session)
throws JMSException {
// Create a message consumer
QueueReceiver receiver = session.createReceiver(queue);
@@ -143,7 +143,7 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void ejbRemove() throws RemoteException {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/build.xml
index 4fda9e4..4b14b14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/build.xml
@@ -30,9 +30,9 @@
<target name="all">
- <antcall target="cmt"/>
- <antcall target="msgbean"/>
- <antcall target="singleton"/>
+ <antcall target="cmt"/>
+ <antcall target="msgbean"/>
+ <antcall target="singleton"/>
</target>
@@ -55,12 +55,12 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant cmt (Executes the ejb-mdb cmt test)
- ant msgbean (Executes the ejb-mdb msgbean test)
- ant singleton (Executes the ejb-mdb singleton test)
- ant all (Executes all the ejb-mdb tests)
- </echo>
+ <echo>
+ Usage:
+ ant cmt (Executes the ejb-mdb cmt test)
+ ant msgbean (Executes the ejb-mdb msgbean test)
+ ant singleton (Executes the ejb-mdb singleton test)
+ ant all (Executes all the ejb-mdb tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.properties b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.properties
index 2bb43b9..caa8942 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-mdb-cmt"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.xml
index 5b9b207..dffff28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
index ec031e0..cbb8d09 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
@@ -51,7 +51,7 @@
private int numMessages = 2;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -60,9 +60,9 @@
public void doTest() {
try {
setup();
- doTest("jms/ejb_mdb_cmt_InQueue", numMessages);
- // @@@ message-destination-ref support
- // oTest("java:comp/env/jms/MsgBeanQueue", numMessages);
+ doTest("jms/ejb_mdb_cmt_InQueue", numMessages);
+ // @@@ message-destination-ref support
+ // oTest("java:comp/env/jms/MsgBeanQueue", numMessages);
stat.addStatus("cmt main", stat.PASS);
} catch(Throwable t) {
stat.addStatus("cmt main", stat.FAIL);
@@ -74,31 +74,31 @@
public void setup() throws Exception {
context = new InitialContext();
-
- QueueConnectionFactory queueConFactory =
+
+ QueueConnectionFactory queueConFactory =
(QueueConnectionFactory) context.lookup
("java:comp/env/FooCF");
-
+
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
queueCon.start();
/*
- TopicConnectionFactory topicConFactory =
+ TopicConnectionFactory topicConFactory =
(TopicConnectionFactory) context.lookup
("jms/TopicConnectionFactory");
-
+
topicCon = topicConFactory.createTopicConnection();
- topicSession =
+ topicSession =
topicCon.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
// Producer will be specified when actual msg is published.
topicPublisher = topicSession.createPublisher(null);
*/
@@ -114,18 +114,18 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
- System.out.println("Sending message " + i + " to " + queue +
+ System.out.println("Sending message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
queueSender.send(queue, msg);
- System.out.println("Sent message " + i + " to " + queue +
+ System.out.println("Sent message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
}
}
- public void sendMsgs(Topic topic, Message msg, int num)
+ public void sendMsgs(Topic topic, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
// System.out.println("Publishing message " + i + " to " + queue);
@@ -134,11 +134,11 @@
}
}
- public void doTest(String destName, int num)
+ public void doTest(String destName, int num)
throws Exception {
Destination dest = (Destination) context.lookup(destName);
-
+
Message message = queueSession.createTextMessage(destName);
// Message message = topicSession.createTextMessage(destName);
message.setBooleanProperty("flag", true);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
index 0154e22..61ea3c4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
@@ -21,7 +21,7 @@
import jakarta.ejb.*;
import javax.naming.*;
-public class MessageBean
+public class MessageBean
implements MessageDrivenBean, MessageListener {
private MessageDrivenContext mdc;
@@ -66,16 +66,16 @@
}
public void setMessageDrivenContext(MessageDrivenContext mdc) {
- this.mdc = mdc;
- System.out.println("In MessageDrivenEJB::setMessageDrivenContext !!");
+ this.mdc = mdc;
+ System.out.println("In MessageDrivenEJB::setMessageDrivenContext !!");
}
public void ejbCreate() throws RemoteException {
- System.out.println("In MessageDrivenEJB::ejbCreate !!");
+ System.out.println("In MessageDrivenEJB::ejbCreate !!");
}
public void ejbRemove() {
- System.out.println("In MessageDrivenEJB::ejbRemove !!");
+ System.out.println("In MessageDrivenEJB::ejbRemove !!");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.properties b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.properties
index d2d90fe..02dd789 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-mdb-msgbean"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.xml
index 322153c..e85a56f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -76,17 +76,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java
index 1052069..9b404cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java
@@ -68,7 +68,7 @@
BFALSE, // jdbc
BFALSE } }; // rollback
- Object[][] onePhaseCommitTests = {
+ Object[][] onePhaseCommitTests = {
{ "jms/queue_cmt", BFALSE, BFALSE, BFALSE },
{ "jms/topic_cmt", BFALSE, BFALSE, BFALSE },
@@ -79,7 +79,7 @@
{ "jms/topic_bmt", BFALSE, BTRUE, BFALSE },
};
- Object[][] twoPhaseCommitTests = {
+ Object[][] twoPhaseCommitTests = {
{ "jms/queue_cmt", BFALSE, BTRUE, BFALSE },
{ "jms/topic_cmt", BFALSE, BTRUE, BFALSE },
@@ -92,21 +92,21 @@
{ "jms/queue_cmt", BTRUE, BTRUE, BFALSE },
{ "jms/topic_cmt", BTRUE, BTRUE, BFALSE },
};
-
- Object[][] rollbackTests = {
+
+ Object[][] rollbackTests = {
{ "jms/queue_cmt", BTRUE, BFALSE, BTRUE },
{ "jms/topic_cmt", BTRUE, BFALSE, BTRUE },
-
+
{ "jms/queue_cmt", BTRUE, BTRUE, BTRUE },
{ "jms/topic_cmt", BTRUE, BTRUE, BTRUE },
-
+
{ "jms/queue_cmt", BFALSE, BFALSE, BTRUE },
{ "jms/topic_cmt", BFALSE, BFALSE, BTRUE },
-
+
{ "jms/queue_cmt", BTRUE, BFALSE, BTRUE },
- { "jms/topic_cmt", BTRUE, BFALSE, BTRUE },
-
+ { "jms/topic_cmt", BTRUE, BFALSE, BTRUE },
+
};
@@ -119,10 +119,10 @@
public void doTest() {
int numIter = 10;
- if(args.length == 0 || (args.length > 0 &&
+ if(args.length == 0 || (args.length > 0 &&
args[0].equals("1pc" )) ) {
System.out.println("Running 1 phase commit msgbean tests");
- numIter = (args.length >= 2) ?
+ numIter = (args.length >= 2) ?
Integer.parseInt(args[1]) : numIter;
doTests(onePhaseCommitTests, numIter);
} else if( args[0].equals("2pc") ) {
@@ -143,22 +143,22 @@
doTests(onePhaseCommitTests, numIter);
doTests(twoPhaseCommitTests, numIter);
doTests(localTxTests, numIter);
- doTests(rollbackTests, numIter);
+ doTests(rollbackTests, numIter);
} else {
userSpecifiedTxTest[0][0] = args[0];
numIter = Integer.parseInt(args[1]);
System.out.println("Running " + userSpecifiedTxTest[0][0]);
System.out.println("Num iterations = " + numIter);
if( args.length == 3 ) {
- userSpecifiedTxTest[0][1] =
+ userSpecifiedTxTest[0][1] =
new Boolean(args[2].indexOf("reply") != -1);
- userSpecifiedTxTest[0][2] =
+ userSpecifiedTxTest[0][2] =
new Boolean((args[2].indexOf("jdbc") != -1));
- userSpecifiedTxTest[0][3] =
+ userSpecifiedTxTest[0][3] =
new Boolean((args[2].indexOf("rollback") != -1));
}
doTests(userSpecifiedTxTest, numIter);
- }
+ }
return;
}
@@ -167,7 +167,7 @@
if (numIter > 20) {
TIMEOUT = TIMEOUT * (int)(numIter / 10);
}
-
+
for(int i = 0; i < tests.length; i++) {
String destName = "java:comp/env/" + (String) tests[i][0];
boolean expectReply = ((Boolean)tests[i][1]).booleanValue();
@@ -178,11 +178,11 @@
try {
setup();
doTest(destName, numIter, expectReply, jdbc, rollback);
- stat.addStatus(test, stat.PASS);
+ stat.addStatus(test, stat.PASS);
} catch(Throwable t) {
System.out.println("Caught unexpected exception " + t);
t.printStackTrace();
- stat.addStatus(test, stat.FAIL);
+ stat.addStatus(test, stat.FAIL);
break;
} finally {
cleanup();
@@ -193,37 +193,37 @@
public void setup() throws Exception {
context = new InitialContext();
-
- QueueConnectionFactory queueConFactory =
+
+ QueueConnectionFactory queueConFactory =
(QueueConnectionFactory) context.lookup
("java:comp/env/jms/QCF");
-
+
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
- clientQueue = (jakarta.jms.Queue)
+ clientQueue = (jakarta.jms.Queue)
context.lookup("java:comp/env/jms/client_queue");
queueReceiver = queueSession.createReceiver(clientQueue);
- TopicConnectionFactory topicConFactory =
+ TopicConnectionFactory topicConFactory =
(TopicConnectionFactory) context.lookup
("java:comp/env/jms/TCF");
-
+
topicCon = topicConFactory.createTopicConnection();
- topicSession =
+ topicSession =
topicCon.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
// Producer will be specified when actual msg is published.
topicPublisher = topicSession.createPublisher(null);
- clientTopic = (Topic)
+ clientTopic = (Topic)
context.lookup("java:comp/env/jms/client_topic");
topicSubscriber = topicSession.createSubscriber(clientTopic);
@@ -249,7 +249,7 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
System.out.println("Sending message " + i + " to " + queue);
@@ -257,7 +257,7 @@
}
}
- public void publishMsgs(Topic topic, Message msg, int num)
+ public void publishMsgs(Topic topic, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
System.out.println("Publishing message " + i + " to " + topic);
@@ -270,7 +270,7 @@
System.out.println("Waiting for queue message " + (i+1) + " of " + num);
Message recvdmessage = queueReceiver.receive(TIMEOUT);
if( recvdmessage != null ) {
- System.out.println("Received message : " +
+ System.out.println("Received message : " +
((TextMessage)recvdmessage).getText());
} else {
System.out.println("timeout after " + TIMEOUT + " seconds");
@@ -284,7 +284,7 @@
System.out.println("Waiting for topic message " + (i+1) + " of " + num);
Message recvdmessage = topicSubscriber.receive(TIMEOUT);
if( recvdmessage != null ) {
- System.out.println("Received message : " +
+ System.out.println("Received message : " +
((TextMessage)recvdmessage).getText());
} else {
System.out.println("timeout after " + TIMEOUT + " seconds");
@@ -293,11 +293,11 @@
}
}
- /**
+ /**
* Generate testname. (Try to keep synched with target names in Makefile.)
*/
- private String generateTestName(String destName, boolean doJdbc,
- boolean expectReply, boolean rollbackEnabled)
+ private String generateTestName(String destName, boolean doJdbc,
+ boolean expectReply, boolean rollbackEnabled)
{
String testName = destName.toLowerCase();
if (doJdbc) {
@@ -317,27 +317,27 @@
}
public void doTest(String destName, int numIter, boolean expectReply,
- boolean doJdbc, boolean rollbackEnabled)
-
- throws Exception
+ boolean doJdbc, boolean rollbackEnabled)
+
+ throws Exception
{
- String testName =
+ String testName =
generateTestName(destName, doJdbc, expectReply, rollbackEnabled);
try {
Destination dest = (Destination) context.lookup(destName);
-
+
boolean pointToPoint = dest instanceof jakarta.jms.Queue;
-
+
System.out.println("Beginning test : " + testName);
-
+
Timer.start();
-
+
if( pointToPoint ) {
- Message message =
+ Message message =
queueSession.createTextMessage(destName);
message.setBooleanProperty("doJdbc", doJdbc);
message.setBooleanProperty("rollbackEnabled", rollbackEnabled);
-
+
/* aid identifying what test message is associated with on JMS server side.
* (JMS RI Message Implementation toString() will print this property if it
* is set.)
@@ -348,11 +348,11 @@
}
sendMsgs((jakarta.jms.Queue) dest, message, numIter);
} else {
- Message message =
+ Message message =
topicSession.createTextMessage(destName);
message.setBooleanProperty("doJdbc", doJdbc);
message.setBooleanProperty("rollbackEnabled", rollbackEnabled);
-
+
/* aid identifying what test message is associated with on JMS server side.
* (JMS RI Message Implementation toString() will print this property if it
* is set.)
@@ -363,7 +363,7 @@
}
publishMsgs((Topic) dest, message, numIter);
}
-
+
if( expectReply ) {
if( pointToPoint ) {
recvQueueMsgs(numIter);
@@ -371,38 +371,38 @@
recvTopicMsgs(numIter);
}
}
-
+
long time = Timer.stop();
-
+
System.out.println("End test : " + testName + ". Time = " +
Timer.format(time) + " -> " + (time/numIter) +
" msec/msg (" + numIter + " msgs)");
} catch (Exception e) {
- System.out.println("Unexpected exception " + e + " in test " +
+ System.out.println("Unexpected exception " + e + " in test " +
testName);
throw e;
}
}
-
+
// helper class for timing the tests
private static class Timer {
static long startTime;
-
+
public static void start() {
startTime = System.currentTimeMillis();
}
-
+
public static long stop() {
return System.currentTimeMillis() - startTime;
}
-
+
/**
* Returns a string that outputs time in an
* easily readable format.
*/
public static String format(long timeIn) {
double foo = ((double)timeIn)/1000;
- long time = Math.round(foo);
+ long time = Math.round(foo);
String ret = null;
if (time < 60) {
ret = time + " seconds";
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
index 59da90d..5c02f21 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
@@ -62,20 +62,20 @@
context = new InitialContext();
beanManagedTx = ((Boolean) context.lookup
("java:comp/env/beanManagedTx")).booleanValue();
-
+
if( beanManagedTx ) {
System.out.println("BEAN MANAGED TRANSACTIONS");
} else {
System.out.println("CONTAINER MANAGED TRANSACTIONS");
}
-
- dataSource = (DataSource)
+
+ dataSource = (DataSource)
context.lookup("java:comp/env/jdbc/AccountDB");
-
+
// Create a Queue Session.
- queueConFactory = (QueueConnectionFactory)
+ queueConFactory = (QueueConnectionFactory)
context.lookup("java:comp/env/jms/MyQueueConnectionFactory");
-
+
topicConFactory = (TopicConnectionFactory)
context.lookup("java:comp/env/jms/MyTopicConnectionFactory");
} catch(Exception e) {
@@ -91,16 +91,16 @@
String messageID = recvMsg.getJMSMessageID();
boolean doJms = (recvMsg.getJMSReplyTo() != null);
- boolean doJdbc =
+ boolean doJdbc =
recvMsg.getBooleanProperty("doJdbc");
- boolean rollbackEnabled =
+ boolean rollbackEnabled =
recvMsg.getBooleanProperty("rollbackEnabled");
System.out.println("In MsgBean::onMessage() : " + messageID);
System.out.println("jdbc enabled : " + doJdbc + " , " +
"jms reply enabled : " + doJms + " , " +
"rollback enabled : " + rollbackEnabled);
-
+
if( beanManagedTx ) {
mdc.getUserTransaction().begin();
} else if( rollbackEnabled ) {
@@ -111,7 +111,7 @@
"but redelivered flag not set" +
" : " + recvMsg);
} else {
- System.out.println("Got redelivered message " +
+ System.out.println("Got redelivered message " +
messageID);
}
}
@@ -123,12 +123,12 @@
mdc.getUserTransaction().commit();
} else if( rollbackEnabled ) {
if( recvMsg.getJMSRedelivered() ) {
- System.out.println("Got redelivered message " +
+ System.out.println("Got redelivered message " +
messageID);
// no more rollbacks -- container will commit tx
} else {
rollbackMessages.add(recvMsg);
- System.out.println("Rolling back message " +
+ System.out.println("Rolling back message " +
messageID);
mdc.setRollbackOnly();
}
@@ -140,13 +140,13 @@
}
protected void doStuff(boolean doJdbc, Message recvMsg) throws Exception {
-
+
Destination replyTo = recvMsg.getJMSReplyTo();
-
+
if( replyTo != null ) {
doJmsStuff(replyTo, recvMsg);
}
-
+
if( doJdbc) {
doJdbcStuff();
}
@@ -178,41 +178,41 @@
QueueConnection queueCon = null;
TopicConnection topicCon = null;
-
+
try {
-
+
if( replyTo instanceof Queue ) {
queueCon = queueConFactory.createQueueConnection();
-
+
// parameters to createQueueSession are ignored when there
// is a tx context. If there's a CMT unspecified tx context,
- // e.g. CMT NotSupported, jms activity must be coded
+ // e.g. CMT NotSupported, jms activity must be coded
// in a defensive way since the container has a lot of leeway
- // in how it performs the work.
+ // in how it performs the work.
QueueSession queueSession = queueCon.
createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
QueueSender sender = queueSession.
createSender((Queue)replyTo);
-
+
TextMessage sendMsg = queueSession.createTextMessage();
sendMsg.setText("Reply for " + ((TextMessage)recvMsg).getText() + " " + recvMsg.getJMSMessageID());
sender.send(sendMsg);
- System.out.println("Sent reply " + sendMsg +
+ System.out.println("Sent reply " + sendMsg +
" to " + replyTo);
} else {
topicCon = topicConFactory.createTopicConnection();
-
+
TopicSession topicSession = topicCon.
createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
TopicPublisher publisher =
topicSession.createPublisher((Topic)replyTo);
-
+
TextMessage sendMsg = topicSession.createTextMessage();
sendMsg.setText("Reply for " + ((TextMessage)recvMsg).getText() + " " + recvMsg.getJMSMessageID());
publisher.publish(sendMsg);
- System.out.println("Published reply " + sendMsg +
+ System.out.println("Published reply " + sendMsg +
" to " + replyTo);
}
} catch(JMSException jmse) {
@@ -230,10 +230,10 @@
}
}
}
-
+
public void setMessageDrivenContext(MessageDrivenContext mdc) {
System.out.println("In MsgBean::setMessageDrivenContext()!!");
- this.mdc = mdc;
+ this.mdc = mdc;
}
public void ejbRemove() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java
index 13ad328..34872e9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java
@@ -23,7 +23,7 @@
/**
* Tests matrix of operations callable from the different
- * methods in a message-driven bean.
+ * methods in a message-driven bean.
*/
public class OperationTest {
@@ -38,18 +38,18 @@
public static final int IS_CALLER_IN_ROLE = 5;
public static final int GET_EJB_HOME = 6;
public static final int USER_TX_BEGIN = 7;
- public static final int USER_TX_COMMIT = 8;
+ public static final int USER_TX_COMMIT = 8;
public static final int USER_TX_ROLLBACK = 9;
public static final int NUM_OPERATIONS = 10;
-
+
// OPERATION SETS (Table 9, Section 13.5.1 EJB 2.0)
- private static boolean[][] OPERATION_SETS =
+ private static boolean[][] OPERATION_SETS =
{
- { false, false, false, false, false, false, false, false, false, false },
+ { false, false, false, false, false, false, false, false, false, false },
{ true, false, false, false, false, false, false, false, false, false },
{ true, true, false, false, false, false, false, true, true, true },
{ true, false, false, true, true, false, false, false, false, false },
- { true, true, false, false, false, false, false, true, true, true }
+ { true, true, false, false, false, false, false, true, true, true }
};
// Transaction types
@@ -62,8 +62,8 @@
public static final int EJB_CREATE = 2;
public static final int EJB_REMOVE = 3;
public static final int ON_MESSAGE = 4;
-
- //
+
+ //
private static final int OPERATION_SET_MATRIX[][] =
{
{ 0, 1, 1, 1, 3 },
@@ -82,11 +82,11 @@
boolean[] testResults = new boolean[NUM_OPERATIONS];
- for(int operation = 0; operation < NUM_OPERATIONS; operation++) {
+ for(int operation = 0; operation < NUM_OPERATIONS; operation++) {
boolean result = false;
try {
switch(operation) {
- case ENV_ACCESS :
+ case ENV_ACCESS :
result = doEnvAccess(); break;
case USER_TX_ACCESS :
result = doUserTxAccess(); break;
@@ -127,7 +127,7 @@
System.out.println("Actual result : " + result);
}
- }
+ }
}
private boolean doEnvAccess() throws Throwable {
@@ -135,7 +135,7 @@
Context env = (Context) context.lookup("java:comp/env");
String envVar = (String) context.lookup("java:comp/env/EnvVar");
return true;
- }
+ }
private boolean doUserTxAccess() throws Throwable {
UserTransaction userTx = mdc.getUserTransaction();
@@ -146,7 +146,7 @@
mdc.getCallerPrincipal();
return true;
}
-
+
private boolean doGetRollbackOnly() throws Throwable {
mdc.getRollbackOnly();
return true;
@@ -187,6 +187,6 @@
userTx.begin();
userTx.rollback();
return true;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
index 9ddef0e..731d6ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
@@ -22,7 +22,7 @@
import jakarta.jms.MessageListener;
import javax.naming.*;
-public class OperationTestMsgBean implements MessageDrivenBean,
+public class OperationTestMsgBean implements MessageDrivenBean,
MessageListener {
private MessageDrivenContext mdc = null;
@@ -39,7 +39,7 @@
System.out.println("In OperationTestMsgBean::ejbCreate() !!");
try {
Context context = new InitialContext();
- beanManagedTx =
+ beanManagedTx =
((Boolean) context.lookup("java:comp/env/beanManagedTx")).booleanValue();
if( beanManagedTx ) {
@@ -55,7 +55,7 @@
}
public void onMessage(Message recvMsg) {
- System.out.println("In OperationTestMsgBean::onMessage() : "
+ System.out.println("In OperationTestMsgBean::onMessage() : "
+ recvMsg);
runTest(OperationTest.ON_MESSAGE);
@@ -64,7 +64,7 @@
public void setMessageDrivenContext(MessageDrivenContext mdc) {
System.out.println
("In OperationTestMsgBean::setMessageDrivenContext()!!");
- this.mdc = mdc;
+ this.mdc = mdc;
runTest(OperationTest.SET_CONTEXT);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.properties b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.properties
index 69733bd..b06d416 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-mdb-singleton"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="glassfish-application.xml" value="descriptor/glassfish-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="glassfish-application-client.xml"
- value="descriptor/glassfish-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="glassfish-application-client.xml"\u0020
+ value="descriptor/glassfish-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.xml
index 1612c40..1f16636 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class, **/*IF.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*IF.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
index c918e9b..ca22dd6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
@@ -26,7 +26,7 @@
/**
* Tests for http://java.net/jira/browse/GLASSFISH-13004 (Support MDB singleton).
- * The test ejb jar is configured with property singleton-bean-pool=true in
+ * The test ejb jar is configured with property singleton-bean-pool=true in
* sun-ejb-jar.xml. This test client calls fooTest and doTest(...):
* fooTest: verify the stateless bean FooBean is single instance;
* doTest(..): verify the mdb MessageBean is single instance.
@@ -59,7 +59,7 @@
private static FooRemoteIF foo;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -68,7 +68,7 @@
public void doTest() {
try {
setup();
- doTest("jms/ejb_mdb_singleton_InQueue", numMessages);
+ doTest("jms/ejb_mdb_singleton_InQueue", numMessages);
fooTest();
stat.addStatus("singleton main", stat.PASS);
} catch(Throwable t) {
@@ -104,8 +104,8 @@
context = new InitialContext();
QueueConnectionFactory queueConFactory = (QueueConnectionFactory) context.lookup ("java:comp/env/FooCF");
queueCon = queueConFactory.createQueueConnection();
- queueSession = queueCon.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
- queueSender = queueSession.createSender(null);
+ queueSession = queueCon.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+ queueSender = queueSession.createSender(null);
queueCon.start();
}
@@ -119,20 +119,20 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
- //System.out.println("Sending message " + i + " to " + queue +
+ //System.out.println("Sending message " + i + " to " + queue +
// " at time " + System.currentTimeMillis());
queueSender.send(queue, msg);
- // System.out.println("Sent message " + i + " to " + queue +
+ // System.out.println("Sent message " + i + " to " + queue +
// " at time " + System.currentTimeMillis());
}
}
public void doTest(String destName, int num) throws Exception {
Destination dest = (Destination) context.lookup(destName);
-
+
for(int i = 0; i < numOfCalls; i++) {
Message message = queueSession.createTextMessage(destName);
// Message message = topicSession.createTextMessage(destName);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.properties b/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.properties
index 8d4938d..d33ce9c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-perf-local"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.xml b/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.xml
index a97e83a..373c08a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/**.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java
index 46ada94..fadc629 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java
@@ -27,7 +27,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -36,32 +36,32 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-perf-localID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
- Context ic = new InitialContext();
+ Context ic = new InitialContext();
- // create EJB using factory from container
- java.lang.Object objref =
+ // create EJB using factory from container
+ java.lang.Object objref =
ic.lookup("java:comp/env/ejb/PerformanceApp");
- System.out.println("Looked up home!!");
+ System.out.println("Looked up home!!");
- HelloHome home = (HelloHome)
+ HelloHome home = (HelloHome)
PortableRemoteObject.narrow(objref, HelloHome.class);
- System.out.println("Narrowed home!!");
+ System.out.println("Narrowed home!!");
- Hello hr = home.create();
- System.out.println("Got the EJB!!");
+ Hello hr = home.create();
+ System.out.println("Got the EJB!!");
- // invoke method on the EJB
- doPerfTest(hr, true);
+ // invoke method on the EJB
+ doPerfTest(hr, true);
doPerfTest(hr, false);
stat.addStatus("local main", stat.PASS);
@@ -70,66 +70,66 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
- private void doPerfTest(Hello hr, boolean local)
- throws Exception
+ private void doPerfTest(Hello hr, boolean local)
+ throws Exception
{
- System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
- hr.warmup(Common.STATEFUL, local);
- runTests(Common.STATEFUL, hr, local);
+ System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
+ hr.warmup(Common.STATEFUL, local);
+ runTests(Common.STATEFUL, hr, local);
- System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
- hr.warmup(Common.STATEFUL, local);
- runTests(Common.STATELESS, hr, local);
+ System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
+ hr.warmup(Common.STATEFUL, local);
+ runTests(Common.STATELESS, hr, local);
- System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
- hr.warmup(Common.BMP, local);
- runTests(Common.BMP, hr, local);
+ System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
+ hr.warmup(Common.BMP, local);
+ runTests(Common.BMP, hr, local);
}
-
+
private void runTests(int type, Hello hr, boolean local)
- throws Exception
+ throws Exception
{
- System.out.println("Testing " + (local ? " Local " :
+ System.out.println("Testing " + (local ? " Local " :
" Collocated Remote ") +
"performance...");
if( local ) {
- System.out.println("notSupported : \t\t\t\t"
+ System.out.println("notSupported : \t\t\t\t"
+ hr.notSupported(type, true) + "\t\t" +
+ hr.notSupported(type, false) );
- System.out.println("supports : \t\t\t\t"
+ System.out.println("supports : \t\t\t\t"
+ hr.supports(type, true) + "\t\t" +
+ hr.supports(type, false) );
- System.out.println("required : \t\t\t\t"
+ System.out.println("required : \t\t\t\t"
+ hr.required(type, true) + "\t\t" +
+ hr.required(type, false) );
- System.out.println("requiresNew : \t\t\t\t"
+ System.out.println("requiresNew : \t\t\t\t"
+ hr.requiresNew(type, true) + "\t\t" +
+ hr.requiresNew(type, false) );
- System.out.println("mandatory : \t\t\t\t"
+ System.out.println("mandatory : \t\t\t\t"
+ hr.mandatory(type, true));
- System.out.println("never : \t\t\t\t\t\t"
+ System.out.println("never : \t\t\t\t\t\t"
+ hr.never(type, false) );
} else {
- System.out.println("notSupported : \t\t\t\t"
+ System.out.println("notSupported : \t\t\t\t"
+ hr.notSupportedRemote(type, true) + "\t\t" +
+ hr.notSupportedRemote(type, false) );
- System.out.println("supports : \t\t\t\t"
+ System.out.println("supports : \t\t\t\t"
+ hr.supportsRemote(type, true) + "\t\t" +
+ hr.supportsRemote(type, false) );
- System.out.println("required : \t\t\t\t"
+ System.out.println("required : \t\t\t\t"
+ hr.requiredRemote(type, true) + "\t\t" +
+ hr.requiredRemote(type, false) );
- System.out.println("requiresNew : \t\t\t\t"
+ System.out.println("requiresNew : \t\t\t\t"
+ hr.requiresNewRemote(type, true) + "\t\t" +
+ hr.requiresNewRemote(type, false) );
- System.out.println("mandatory : \t\t\t\t"
+ System.out.println("mandatory : \t\t\t\t"
+ hr.mandatoryRemote(type, true));
- System.out.println("never : \t\t\t\t\t\t"
+ System.out.println("never : \t\t\t\t\t\t"
+ hr.neverRemote(type, false) );
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java
index cbc28cc..baabe4d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java
@@ -23,7 +23,7 @@
public BmpEJB(){}
public String ejbCreate(String s) {
- return s;
+ return s;
}
public void ejbPostCreate(String s) {}
@@ -41,10 +41,10 @@
public void unsetEntityContext()
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -57,6 +57,6 @@
{}
public String ejbFindByPrimaryKey(String s) {
- return s;
+ return s;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java
index 5dec60c..76dbcb4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java
@@ -22,5 +22,5 @@
public interface BmpRemoteHome extends EJBHome
{
BmpRemote create(String s) throws RemoteException, CreateException;
- BmpRemote findByPrimaryKey(String s) throws RemoteException, CreateException;
+ BmpRemote findByPrimaryKey(String s) throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java
index 28b022a..fc8f13f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java
@@ -46,10 +46,10 @@
public void ejbCreate() {
- try {
+ try {
System.out.println("Num iterations set to " + ITERATIONS);
Context ic = new InitialContext();
- SfulHome sfulHome = (SfulHome) ic.lookup("java:comp/env/ejb/Sful");
+ SfulHome sfulHome = (SfulHome) ic.lookup("java:comp/env/ejb/Sful");
sful = sfulHome.create();
@@ -57,19 +57,19 @@
sfulRemoteHome = (SfulRemoteHome)
PortableRemoteObject.narrow(obj, SfulRemoteHome.class);
sfulRemote = sfulRemoteHome.create();
- System.out.println("Created Stateful bean.");
+ System.out.println("Created Stateful bean.");
-
- SlessHome slessHome = (SlessHome) ic.lookup("java:comp/env/ejb/Sless");
+
+ SlessHome slessHome = (SlessHome) ic.lookup("java:comp/env/ejb/Sless");
sless = slessHome.create();
obj = ic.lookup("java:comp/env/ejb/SlessRemote");
slessRemoteHome = (SlessRemoteHome)
PortableRemoteObject.narrow(obj, SlessRemoteHome.class);
slessRemote = slessRemoteHome.create();
- System.out.println("Created Stateless bean.");
+ System.out.println("Created Stateless bean.");
- BmpHome bmpHome = (BmpHome) ic.lookup("java:comp/env/ejb/Bmp");
+ BmpHome bmpHome = (BmpHome) ic.lookup("java:comp/env/ejb/Bmp");
String pkey = "A BMP Bean";
bmp = bmpHome.create(pkey);
obj = ic.lookup("java:comp/env/ejb/BmpRemote");
@@ -77,14 +77,14 @@
PortableRemoteObject.narrow(obj, BmpRemoteHome.class);
bmpRemote = (BmpRemote)
bmpRemoteHome.findByPrimaryKey(pkey);
- System.out.println("Created BMP bean.");
-
- ut = context.getUserTransaction();
+ System.out.println("Created BMP bean.");
- } catch (Exception ex) {
- System.out.println("couldn't get sful bean");
- ex.printStackTrace();
- }
+ ut = context.getUserTransaction();
+
+ } catch (Exception ex) {
+ System.out.println("couldn't get sful bean");
+ ex.printStackTrace();
+ }
}
@@ -97,224 +97,224 @@
warmupRemote(type, false);
}
- // Measure looping and timing overhead
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- }
- long end = System.currentTimeMillis();
- overhead = end - begin;
+ // Measure looping and timing overhead
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ }
+ long end = System.currentTimeMillis();
+ overhead = end - begin;
}
private void warmupLocal(int type, boolean tx) throws Exception {
- // get Hotspot warmed up
- Common bean = preLocal(type, tx);
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- bean.notSupported();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- if ( tx )
- bean.mandatory();
- else
- bean.never();
- bean.supports();
- }
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
+ // get Hotspot warmed up
+ Common bean = preLocal(type, tx);
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ bean.notSupported();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ if ( tx )
+ bean.mandatory();
+ else
+ bean.never();
+ bean.supports();
+ }
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
ex.printStackTrace();
}
}
private void warmupRemote(int type, boolean tx) throws Exception {
- // get Hotspot warmed up
- CommonRemote bean = preRemote(type, tx);
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- bean.notSupported();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- if ( tx )
- bean.mandatory();
- else
- bean.never();
- bean.supports();
- }
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
+ // get Hotspot warmed up
+ CommonRemote bean = preRemote(type, tx);
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ bean.notSupported();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ if ( tx )
+ bean.mandatory();
+ else
+ bean.never();
+ bean.supports();
+ }
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
ex.printStackTrace();
}
}
- private Common preLocal(int type, boolean tx)
+ private Common preLocal(int type, boolean tx)
{
- if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
+ if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
ex.printStackTrace();
}
- if ( type == Common.STATELESS )
- return sless;
- else if ( type == Common.STATEFUL )
- return sful;
- else
- return bmp;
+ if ( type == Common.STATELESS )
+ return sless;
+ else if ( type == Common.STATEFUL )
+ return sful;
+ else
+ return bmp;
}
- private CommonRemote preRemote(int type, boolean tx)
+ private CommonRemote preRemote(int type, boolean tx)
{
- if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
+ if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
ex.printStackTrace();
}
- if ( type == Common.STATELESS )
- return slessRemote;
- else if ( type == Common.STATEFUL )
- return sfulRemote;
- else
- return bmpRemote;
+ if ( type == Common.STATELESS )
+ return slessRemote;
+ else if ( type == Common.STATEFUL )
+ return sfulRemote;
+ else
+ return bmpRemote;
}
private float post(long begin, long end, boolean tx)
{
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
ex.printStackTrace();
}
- return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
+ return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
}
- public float requiresNew(int type, boolean tx)
+ public float requiresNew(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float notSupported(int type, boolean tx)
+ public float notSupported(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.notSupported();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.notSupported();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float required(int type, boolean tx)
+ public float required(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float mandatory(int type, boolean tx)
+ public float mandatory(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.mandatory();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.mandatory();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float never(int type, boolean tx)
+ public float never(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.never();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.never();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float supports(int type, boolean tx)
+ public float supports(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.supports();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.supports();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float requiresNewRemote(int type, boolean tx) throws Exception
{
- CommonRemote bean = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ CommonRemote bean = preRemote(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float notSupportedRemote(int type, boolean tx) throws Exception
{
- CommonRemote bean = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.notSupported();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ CommonRemote bean = preRemote(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.notSupported();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float requiredRemote(int type, boolean tx) throws Exception
{
- CommonRemote bean = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ CommonRemote bean = preRemote(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float mandatoryRemote(int type, boolean tx) throws Exception
{
- CommonRemote bean = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.mandatory();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ CommonRemote bean = preRemote(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.mandatory();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float neverRemote(int type, boolean tx) throws Exception
{
- CommonRemote bean = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.never();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ CommonRemote bean = preRemote(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.never();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float supportsRemote(int type, boolean tx) throws Exception
{
- CommonRemote bean = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.supports();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ CommonRemote bean = preRemote(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.supports();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public void setSessionContext(SessionContext sc) {
- context = sc;
+ context = sc;
}
public void ejbRemove() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java
index bdb44b1..34cd506 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java
@@ -34,10 +34,10 @@
public void setSessionContext(SessionContext sc)
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java
index cf5b7d0..84e584a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java
@@ -34,10 +34,10 @@
public void setSessionContext(SessionContext sc)
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/Compare.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/Compare.java
index a89d369..e6c7b0c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/Compare.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/Compare.java
@@ -28,7 +28,7 @@
File file1 = new File(file1Name);
File file2 = new File(file2Name);
-
+
float allResults = 0;
int totalResults = 0;
@@ -39,16 +39,16 @@
LineNumberReader reader2 = new LineNumberReader
(new FileReader(file2));
-
+
String nextLine1 = reader1.readLine();
while(nextLine1 != null) {
String nextLine2 = reader2.readLine();
-
- StringTokenizer tokenizer1 =
+
+ StringTokenizer tokenizer1 =
new StringTokenizer(nextLine1);
- StringTokenizer tokenizer2 =
- new StringTokenizer(nextLine2);
+ StringTokenizer tokenizer2 =
+ new StringTokenizer(nextLine2);
StringBuffer category = new StringBuffer();
boolean tx = true;
int numResults = 0;
@@ -82,7 +82,7 @@
nextLine1 = reader1.readLine();
System.out.println();
- }
+ }
System.out.println("total results = " + totalResults);
System.out.println("avg pcg dif = " + allResults / totalResults);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.properties b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.properties
index 9390a51..ec2d015 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-perf-local2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.xml b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.xml
index a780b75..e85c14f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/**.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,10 +63,10 @@
<param name="appclient.application.args" value="50000 10"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java
index 3805e03..d5d20a1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java
@@ -27,7 +27,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private int numIterations = 500000;
@@ -41,16 +41,16 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-perf-local2ID");
- }
-
+ }
+
public Client (String[] args) {
if (args.length > 0) {
numIterations = Integer.parseInt(args[0]);
numThreads = Integer.parseInt(args[1]);
}
-
+
}
-
+
public void doTest() {
try {
@@ -58,26 +58,26 @@
System.out.println("Num iterations set to " + numIterations);
System.out.println("Num threads set to " + numThreads);
- Context ic = new InitialContext();
+ Context ic = new InitialContext();
- // create EJB using factory from container
- java.lang.Object objref =
+ // create EJB using factory from container
+ java.lang.Object objref =
ic.lookup("java:comp/env/ejb/PerformanceApp");
- System.out.println("Looked up home!!");
+ System.out.println("Looked up home!!");
- HelloHome home = (HelloHome)
+ HelloHome home = (HelloHome)
PortableRemoteObject.narrow(objref, HelloHome.class);
- System.out.println("Narrowed home!!");
+ System.out.println("Narrowed home!!");
hellos = new Hello[numThreads];
for(int i = 0; i < numThreads; i++) {
hellos[i] = home.create(numIterations);
}
- System.out.println("Got the EJB!!");
+ System.out.println("Got the EJB!!");
- // invoke method on the EJB
- doPerfTest();
+ // invoke method on the EJB
+ doPerfTest();
stat.addStatus("local2 main", stat.PASS);
@@ -85,61 +85,61 @@
e.printStackTrace();
stat.addStatus("local2 main" , stat.FAIL);
}
-
- return;
+
+ return;
}
- private void doPerfTest()
- throws Exception
+ private void doPerfTest()
+ throws Exception
{
- System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
+ System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
hellos[0].warmup(Common.STATEFUL);
-
- runTests(Common.STATEFUL);
- System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
+ runTests(Common.STATEFUL);
+
+ System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
hellos[0].warmup(Common.STATELESS);
- runTests(Common.STATELESS);
+ runTests(Common.STATELESS);
- System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
+ System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
hellos[0].warmup(Common.BMP);
- runTests(Common.BMP);
+ runTests(Common.BMP);
}
-
+
private void runTests(int type)
- throws Exception
+ throws Exception
{
- System.out.println("car no tx : \t\t\t\t"
+ System.out.println("car no tx : \t\t\t\t"
+ runTest(type, InvokeType.CAR, false));
- System.out.println("notSupported : \t\t\t\t"
+ System.out.println("notSupported : \t\t\t\t"
+ runTest(type, InvokeType.NOT_SUPPORTED,
true) + "\t\t" +
+ runTest(type, InvokeType.NOT_SUPPORTED,
false));
- System.out.println("supports : \t\t\t\t"
+ System.out.println("supports : \t\t\t\t"
+ runTest(type, InvokeType.SUPPORTS, true) + "\t\t" +
+ runTest(type, InvokeType.SUPPORTS, false) );
- System.out.println("required : \t\t\t\t"
+ System.out.println("required : \t\t\t\t"
+ runTest(type, InvokeType.REQUIRED,true) + "\t\t" +
+ runTest(type, InvokeType.REQUIRED, false) );
- System.out.println("requiresNew : \t\t\t\t"
+ System.out.println("requiresNew : \t\t\t\t"
+ runTest(type, InvokeType.REQUIRES_NEW, true) + "\t\t" +
+ runTest(type, InvokeType.REQUIRES_NEW, false) );
- System.out.println("mandatory : \t\t\t\t"
+ System.out.println("mandatory : \t\t\t\t"
+ runTest(type, InvokeType.MANDATORY, true));
- System.out.println("never : \t\t\t\t\t\t"
+ System.out.println("never : \t\t\t\t\t\t"
+ runTest(type, InvokeType.NEVER, false) );
}
private float runTest(int type, InvokeType invokeType,
boolean tx) throws Exception {
-
+
InvokeThread[] threads = new InvokeThread[numThreads];
for(int i = 0; i < numThreads; i++) {
threads[i] = new InvokeThread(invokeType, type, hellos[i], tx);
@@ -157,7 +157,7 @@
}
return total / numThreads;
-
+
}
enum InvokeType {
@@ -192,50 +192,50 @@
try {
switch(invokeType) {
-
+
case CAR :
resultTime = invokeTarget.createAccessRemove
(invokeBeanType, invokeTx);
-
+
break;
-
+
case NOT_SUPPORTED :
resultTime = invokeTarget.notSupported
(invokeBeanType, invokeTx);
-
+
break;
-
+
case SUPPORTS :
resultTime = invokeTarget.supports
(invokeBeanType, invokeTx);
-
+
break;
-
+
case REQUIRED :
resultTime = invokeTarget.required
(invokeBeanType, invokeTx);
-
+
break;
-
-
+
+
case REQUIRES_NEW :
resultTime = invokeTarget.requiresNew
(invokeBeanType, invokeTx);
-
+
break;
-
-
+
+
case MANDATORY :
resultTime = invokeTarget.mandatory
(invokeBeanType, invokeTx);
-
+
break;
-
-
+
+
case NEVER :
resultTime = invokeTarget.never
(invokeBeanType, invokeTx);
-
+
break;
}
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java
index 2183b29..5e80e0a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java
@@ -23,7 +23,7 @@
public BmpEJB(){}
public String ejbCreate(String s) {
- return s;
+ return s;
}
public void ejbPostCreate(String s) {}
@@ -41,10 +41,10 @@
public void unsetEntityContext()
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -57,6 +57,6 @@
{}
public String ejbFindByPrimaryKey(String s) {
- return s;
+ return s;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java
index 993be3c..b731349 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java
@@ -43,46 +43,46 @@
public void ejbCreate(int numIterations) {
- try {
+ try {
iterations = numIterations;
System.out.println("Num iterations set to " + iterations);
Context ic = new InitialContext();
- sfulHome = (SfulHome) ic.lookup("java:comp/env/ejb/Sful");
+ sfulHome = (SfulHome) ic.lookup("java:comp/env/ejb/Sful");
sful = sfulHome.create();
- System.out.println("Created Stateful bean.");
+ System.out.println("Created Stateful bean.");
-
- slessHome = (SlessHome) ic.lookup("java:comp/env/ejb/Sless");
+
+ slessHome = (SlessHome) ic.lookup("java:comp/env/ejb/Sless");
sless = slessHome.create();
- System.out.println("Created Stateless bean.");
+ System.out.println("Created Stateless bean.");
- bmpHome = (BmpHome) ic.lookup("java:comp/env/ejb/Bmp");
-
+ bmpHome = (BmpHome) ic.lookup("java:comp/env/ejb/Bmp");
+
bmp = bmpHome.create(pkey);
- System.out.println("Created BMP bean.");
-
- ut = context.getUserTransaction();
+ System.out.println("Created BMP bean.");
- } catch (Exception ex) {
- System.out.println("couldn't get sful bean");
- ex.printStackTrace();
- }
+ ut = context.getUserTransaction();
+
+ } catch (Exception ex) {
+ System.out.println("couldn't get sful bean");
+ ex.printStackTrace();
+ }
}
- public float createAccessRemove(int type, boolean tx)
+ public float createAccessRemove(int type, boolean tx)
throws Exception {
- long begin = System.currentTimeMillis();
+ long begin = System.currentTimeMillis();
for ( int i=0; i<iterations; i++ ) {
Common bean = preLocal(type, tx, true);
bean.required();
bean.remove();
}
-
+
long end = System.currentTimeMillis();
return post(begin, end, false);
}
@@ -91,42 +91,42 @@
warmupLocal(type, true);
warmupLocal(type, false);
- // Measure looping and timing overhead
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- }
- long end = System.currentTimeMillis();
- overhead = end - begin;
+ // Measure looping and timing overhead
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ }
+ long end = System.currentTimeMillis();
+ overhead = end - begin;
}
private void warmupLocal(int type, boolean tx) throws Exception {
- // get Hotspot warmed up
- Common bean = preLocal(type, tx);
- for ( int i=0; i<iterations; i++ ) {
- bean.requiresNew();
- bean.notSupported();
- }
- for ( int i=0; i<iterations; i++ ) {
- bean.required();
- if ( tx )
- bean.mandatory();
- else
- bean.never();
- bean.supports();
- }
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
+ // get Hotspot warmed up
+ Common bean = preLocal(type, tx);
+ for ( int i=0; i<iterations; i++ ) {
+ bean.requiresNew();
+ bean.notSupported();
+ }
+ for ( int i=0; i<iterations; i++ ) {
+ bean.required();
+ if ( tx )
+ bean.mandatory();
+ else
+ bean.never();
+ bean.supports();
+ }
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
ex.printStackTrace();
}
}
- private Common preLocal(int type, boolean tx)
+ private Common preLocal(int type, boolean tx)
{
return preLocal(type, tx, false);
}
- private Common preLocal(int type, boolean tx, boolean createNew)
+ private Common preLocal(int type, boolean tx, boolean createNew)
{
- if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
+ if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
ex.printStackTrace();
}
try {
@@ -144,82 +144,82 @@
private float post(long begin, long end, boolean tx)
{
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
ex.printStackTrace();
}
- return (float)( ((double)(end-begin-overhead))/((double)iterations) * 1000.0 );
+ return (float)( ((double)(end-begin-overhead))/((double)iterations) * 1000.0 );
}
- public float requiresNew(int type, boolean tx)
+ public float requiresNew(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- bean.requiresNew();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ bean.requiresNew();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float notSupported(int type, boolean tx)
+ public float notSupported(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- bean.notSupported();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ bean.notSupported();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float required(int type, boolean tx)
+ public float required(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- bean.required();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ bean.required();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float mandatory(int type, boolean tx)
+ public float mandatory(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- bean.mandatory();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ bean.mandatory();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float never(int type, boolean tx)
+ public float never(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- bean.never();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ bean.never();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float supports(int type, boolean tx)
+ public float supports(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- bean.supports();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ bean.supports();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public void setSessionContext(SessionContext sc) {
- context = sc;
+ context = sc;
}
public void ejbRemove() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java
index 3648c86..8f267f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java
@@ -34,10 +34,10 @@
public void setSessionContext(SessionContext sc)
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java
index 92328cb..b8199d9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java
@@ -34,10 +34,10 @@
public void setSessionContext(SessionContext sc)
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.properties b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.properties
index 7db9a53..cb26779 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-perf-timer1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.xml b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.xml
index 1a80cc0..f08e90d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1 1000"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
index f89ef88..343091b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
@@ -27,9 +27,9 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
-
- private static SimpleReporterAdapter stat =
+
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static @EJB TimerSession timerSession;
@@ -37,7 +37,7 @@
private static @Resource(mappedName="jms/ejb_perf_timer1_TQCF")
QueueConnectionFactory qcFactory;
- private static @Resource(mappedName="jms/ejb_perf_timer1_TQueue")
+ private static @Resource(mappedName="jms/ejb_perf_timer1_TQueue")
Queue queue;
public static void main(String args[]) {
@@ -56,30 +56,30 @@
public String doTest(int interval, int maxTimeouts) {
String result = kTestPassed;
- QueueConnection connection = null;
+ QueueConnection connection = null;
timerSession.createTimer(interval, maxTimeouts);
System.out.println("Creating periodic timer with interval of " +
interval + " milliseconds.");
System.out.println("Max timeouts = " + maxTimeouts);
-
+
try {
connection = qcFactory.createQueueConnection();
- QueueSession session =
+ QueueSession session =
connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
QueueReceiver receiver = session.createReceiver(queue);
connection.start();
System.out.println("Waiting for message");
Message message = receiver.receive();
TextMessage textMsg = (TextMessage)message;
-
- if ( (message == null) ||
+
+ if ( (message == null) ||
(! textMsg.getText().equals("ejbTimeout() invoked")))
throw new Exception("Received a null message ... TimeOut failed!!");
System.out.println("Message : " + message);
-
-
+
+
stat.addStatus("timer1 ", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java
index 1ae84cc..ee420e1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java
@@ -22,6 +22,6 @@
public interface TimerSession {
public void createTimer(int intervalInMillis, int numTimeouts);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
index b4b01d0..b31e31c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
@@ -37,7 +37,7 @@
private QueueConnection connection;
private QueueSession session;
-
+
@Resource(mappedName="jms/ejb_perf_timer1_TQueue")
private Queue queue;
@@ -58,7 +58,7 @@
public void ejbTimeout(Timer timer) {
timeoutCount++;
-
+
if( timeoutCount <= maxTimeouts ) {
return;
}
@@ -74,7 +74,7 @@
connection = qcFactory.createQueueConnection();
- QueueSession session =
+ QueueSession session =
connection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
sender = session.createSender(queue);
@@ -96,7 +96,7 @@
} catch(Exception e) {
e.printStackTrace();
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/pom.xml b/appserver/tests/appserv-tests/devtests/ejb/pom.xml
index bb59501..cd7940c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.glassfish.main.tests</groupId>
<artifactId>tests</artifactId>
<packaging>pom</packaging>
- <name>GlassFish devtests ejb</name>
+ <name>GlassFish devtests ejb</name>
<modules>
<!-- module>quicklook</module -->
</modules>
@@ -44,13 +44,13 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
<version>1.8.0</version>
- <scope>system</scope>
- <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
- </dependency>
+ <scope>system</scope>
+ <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
+ </dependency>
</dependencies>
<executions>
<execution>
@@ -58,8 +58,8 @@
<phase>test</phase>
<configuration>
<target name="antTests">
- <property name="testMods" value="all"/>
- <property name="ant-contrib-path" value="${maven.dependency.ant-contrib.ant-contrib.jar.path}"/>
+ <property name="testMods" value="all"/>
+ <property name="ant-contrib-path" value="${maven.dependency.ant-contrib.ant-contrib.jar.path}"/>
<ant antfile="build.xml" target="antTests"/>
</target>
</configuration>
@@ -72,7 +72,7 @@
<phase>clean</phase>
<configuration>
<target name="clean-result">
- <property name="ant-contrib-path" value="${maven.dependency.ant-contrib.ant-contrib.jar.path}"/>
+ <property name="ant-contrib-path" value="${maven.dependency.ant-contrib.ant-contrib.jar.path}"/>
<ant antfile="build.xml" target="clean-result"/>
</target>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/run_test.sh b/appserver/tests/appserv-tests/devtests/ejb/run_test.sh
index 5951e84..fc61efc 100755
--- a/appserver/tests/appserv-tests/devtests/ejb/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/ejb/run_test.sh
@@ -17,284 +17,284 @@
test_run_ejb(){
- rm -rf ${S1AS_HOME}/domains/domain1
- cd ${APS_HOME}
- echo "AS_ADMIN_PASSWORD=" > temppwd
- cat ${APS_HOME}/temppwd
+ rm -rf ${S1AS_HOME}/domains/domain1
+ cd ${APS_HOME}
+ echo "AS_ADMIN_PASSWORD=" > temppwd
+ cat ${APS_HOME}/temppwd
- ADMIN_PORT=45707
- JMS_PORT=45708
- JMX_PORT=45709
- ORB_PORT=45710
- SSL_PORT=45711
- INSTANCE_PORT=45712
- ALTERNATE_PORT=45713
- ORB_SSL_PORT=45714
- ORB_SSL_MUTUALAUTH_PORT=45715
- DB_PORT=45716
- DB_PORT_2=45717
+ ADMIN_PORT=45707
+ JMS_PORT=45708
+ JMX_PORT=45709
+ ORB_PORT=45710
+ SSL_PORT=45711
+ INSTANCE_PORT=45712
+ ALTERNATE_PORT=45713
+ ORB_SSL_PORT=45714
+ ORB_SSL_MUTUALAUTH_PORT=45715
+ DB_PORT=45716
+ DB_PORT_2=45717
- ${S1AS_HOME}/bin/asadmin \
- --user anonymous \
- --passwordfile ${APS_HOME}/temppwd \
- create-domain \
- --adminport ${ADMIN_PORT} \
- --domainproperties jms.port=${JMS_PORT}:domain.jmxPort=${JMX_PORT}:orb.listener.port=${ORB_PORT}:http.ssl.port=${SSL_PORT}:orb.ssl.port=${ORB_SSL_PORT}:orb.mutualauth.port=${ORB_SSL_MUTUALAUTH_PORT} \
- --instanceport ${INSTANCE_PORT} \
- domain1
+ ${S1AS_HOME}/bin/asadmin \
+ --user anonymous \
+ --passwordfile ${APS_HOME}/temppwd \
+ create-domain \
+ --adminport ${ADMIN_PORT} \
+ --domainproperties jms.port=${JMS_PORT}:domain.jmxPort=${JMX_PORT}:orb.listener.port=${ORB_PORT}:http.ssl.port=${SSL_PORT}:orb.ssl.port=${ORB_SSL_PORT}:orb.mutualauth.port=${ORB_SSL_MUTUALAUTH_PORT} \
+ --instanceport ${INSTANCE_PORT} \
+ domain1
- # Create
- echo "admin.domain=domain1
- admin.domain.dir=\${env.S1AS_HOME}/domains
- admin.port=${ADMIN_PORT}
- admin.user=anonymous
- admin.host=localhost
- http.port=${INSTANCE_PORT}
- https.port=${SSL_PORT}
- http.host=localhost
- http.address=127.0.0.1
- http.alternate.port=${ALTERNATE_PORT}
- orb.port=${ORB_PORT}
- admin.password=
- ssl.password=changeit
- master.password=changeit
- admin.password.file=\${env.APS_HOME}/config/adminpassword.txt
- appserver.instance.name=server
- config.dottedname.prefix=server
- resources.dottedname.prefix=domain.resources
- results.mailhost=localhost
- results.mailer=QLTestsForPEInstallOrDASInEEInstall@sun.com
- results.mailee=yourname@sun.com
- autodeploy.dir=\${env.S1AS_HOME}/domains/\${admin.domain}/autodeploy
- precompilejsp=true
- jvm.maxpermsize=192m
- appserver.instance.dir=\${admin.domain.dir}/\${admin.domain}" > config.properties
+ # Create
+ echo "admin.domain=domain1
+ admin.domain.dir=\${env.S1AS_HOME}/domains
+ admin.port=${ADMIN_PORT}
+ admin.user=anonymous
+ admin.host=localhost
+ http.port=${INSTANCE_PORT}
+ https.port=${SSL_PORT}
+ http.host=localhost
+ http.address=127.0.0.1
+ http.alternate.port=${ALTERNATE_PORT}
+ orb.port=${ORB_PORT}
+ admin.password=
+ ssl.password=changeit
+ master.password=changeit
+ admin.password.file=\${env.APS_HOME}/config/adminpassword.txt
+ appserver.instance.name=server
+ config.dottedname.prefix=server
+ resources.dottedname.prefix=domain.resources
+ results.mailhost=localhost
+ results.mailer=QLTestsForPEInstallOrDASInEEInstall@sun.com
+ results.mailee=yourname@sun.com
+ autodeploy.dir=\${env.S1AS_HOME}/domains/\${admin.domain}/autodeploy
+ precompilejsp=true
+ jvm.maxpermsize=192m
+ appserver.instance.dir=\${admin.domain.dir}/\${admin.domain}" > config.properties
- (jps |grep Main |cut -f1 -d" " | xargs kill -9 > /dev/null 2>&1) || true
+ (jps |grep Main |cut -f1 -d" " | xargs kill -9 > /dev/null 2>&1) || true
- cd ${S1AS_HOME}/domains/domain1/config/
- sed "s/1527/${DB_PORT}/g" domain.xml > domain.xml.replaced
- mv domain.xml.replaced domain.xml
- grep PortNumber domain.xml
+ cd ${S1AS_HOME}/domains/domain1/config/
+ sed "s/1527/${DB_PORT}/g" domain.xml > domain.xml.replaced
+ mv domain.xml.replaced domain.xml
+ grep PortNumber domain.xml
- cd ${APS_HOME}/config
- (rm derby.properties.replaced > /dev/null 2>&1) || true
- sed "s/1527/${DB_PORT}/g" derby.properties > derby.properties.replaced
- rm derby.properties
- sed "s/1528/${DB_PORT_2}/g" derby.properties.replaced > derby.properties
- cat derby.properties
- rm -rf ${APS_HOME}/test_results*
- cd ${APS_HOME}/devtests/ejb
- rm count.txt || true
+ cd ${APS_HOME}/config
+ (rm derby.properties.replaced > /dev/null 2>&1) || true
+ sed "s/1527/${DB_PORT}/g" derby.properties > derby.properties.replaced
+ rm derby.properties
+ sed "s/1528/${DB_PORT_2}/g" derby.properties.replaced > derby.properties
+ cat derby.properties
+ rm -rf ${APS_HOME}/test_results*
+ cd ${APS_HOME}/devtests/ejb
+ rm count.txt || true
- ant ${TARGET} report-result -Ddb.port=${DB_PORT} -Ddb.port.2=${DB_PORT_2} |tee $TEST_RUN_LOG
+ ant ${TARGET} report-result -Ddb.port=${DB_PORT} -Ddb.port.2=${DB_PORT_2} |tee $TEST_RUN_LOG
}
test_run_ejb_web(){
- rm -rf $S1AS_HOME/domains/domain1
+ rm -rf $S1AS_HOME/domains/domain1
- export ADMIN_PORT=45707 \
- JMS_PORT=45708 \
- JMX_PORT=45709 \
- ORB_PORT=45710 \
- SSL_PORT=45711 \
- INSTANCE_PORT=45712 \
- INSTANCE_HTTPS_PORT=45718 \
- INSTANCE_PORT_2=45719 \
- INSTANCE_PORT_3=45720 \
- ALTERNATE_PORT=45713 \
- ORB_SSL_PORT=45714 \
- ORB_SSL_MUTUALAUTH_PORT=45715 \
- DB_PORT=45716 \
- DB_PORT_2=45717
- env
+ export ADMIN_PORT=45707 \
+ JMS_PORT=45708 \
+ JMX_PORT=45709 \
+ ORB_PORT=45710 \
+ SSL_PORT=45711 \
+ INSTANCE_PORT=45712 \
+ INSTANCE_HTTPS_PORT=45718 \
+ INSTANCE_PORT_2=45719 \
+ INSTANCE_PORT_3=45720 \
+ ALTERNATE_PORT=45713 \
+ ORB_SSL_PORT=45714 \
+ ORB_SSL_MUTUALAUTH_PORT=45715 \
+ DB_PORT=45716 \
+ DB_PORT_2=45717
+ env
- cd ${APS_HOME}
+ cd ${APS_HOME}
- echo "AS_ADMIN_PASSWORD=" > temppwd
- cat ${APS_HOME}/temppwd
- ${S1AS_HOME}/bin/asadmin \
- --user anonymous \
- --passwordfile ${APS_HOME}/temppwd \
- create-domain \
- --adminport ${ADMIN_PORT} \
- --domainproperties jms.port=${JMS_PORT}:domain.jmxPort=${JMX_PORT}:orb.listener.port=${ORB_PORT}:http.ssl.port=${SSL_PORT}:orb.ssl.port=${ORB_SSL_PORT}:orb.mutualauth.port=${ORB_SSL_MUTUALAUTH_PORT} \
- --instanceport ${INSTANCE_PORT} \
- domain1
+ echo "AS_ADMIN_PASSWORD=" > temppwd
+ cat ${APS_HOME}/temppwd
+ ${S1AS_HOME}/bin/asadmin \
+ --user anonymous \
+ --passwordfile ${APS_HOME}/temppwd \
+ create-domain \
+ --adminport ${ADMIN_PORT} \
+ --domainproperties jms.port=${JMS_PORT}:domain.jmxPort=${JMX_PORT}:orb.listener.port=${ORB_PORT}:http.ssl.port=${SSL_PORT}:orb.ssl.port=${ORB_SSL_PORT}:orb.mutualauth.port=${ORB_SSL_MUTUALAUTH_PORT} \
+ --instanceport ${INSTANCE_PORT} \
+ domain1
- # Create
- echo "admin.domain=domain1
- admin.domain.dir=\${env.S1AS_HOME}/domains
- admin.port=${ADMIN_PORT}
- admin.user=anonymous
- admin.host=localhost
- http.port=${INSTANCE_PORT}
- https.port=${SSL_PORT}
- http.host=localhost
- http.address=127.0.0.1
- http.alternate.port=${ALTERNATE_PORT}
- orb.port=${ORB_PORT}
- admin.password=
- ssl.password=changeit
- master.password=changeit
- admin.password.file=\${env.APS_HOME}/config/adminpassword.txt
- appserver.instance.name=server
- config.dottedname.prefix=server
- resources.dottedname.prefix=domain.resources
- results.mailhost=localhost
- results.mailer=QLTestsForPEInstallOrDASInEEInstall@sun.com
- results.mailee=yourname@sun.com
- autodeploy.dir=\${env.S1AS_HOME}/domains/\${admin.domain}/autodeploy
- precompilejsp=true
- jvm.maxpermsize=192m
- appserver.instance.dir=\${admin.domain.dir}/\${admin.domain}" > config.properties
+ # Create
+ echo "admin.domain=domain1
+ admin.domain.dir=\${env.S1AS_HOME}/domains
+ admin.port=${ADMIN_PORT}
+ admin.user=anonymous
+ admin.host=localhost
+ http.port=${INSTANCE_PORT}
+ https.port=${SSL_PORT}
+ http.host=localhost
+ http.address=127.0.0.1
+ http.alternate.port=${ALTERNATE_PORT}
+ orb.port=${ORB_PORT}
+ admin.password=
+ ssl.password=changeit
+ master.password=changeit
+ admin.password.file=\${env.APS_HOME}/config/adminpassword.txt
+ appserver.instance.name=server
+ config.dottedname.prefix=server
+ resources.dottedname.prefix=domain.resources
+ results.mailhost=localhost
+ results.mailer=QLTestsForPEInstallOrDASInEEInstall@sun.com
+ results.mailee=yourname@sun.com
+ autodeploy.dir=\${env.S1AS_HOME}/domains/\${admin.domain}/autodeploy
+ precompilejsp=true
+ jvm.maxpermsize=192m
+ appserver.instance.dir=\${admin.domain.dir}/\${admin.domain}" > config.properties
- (jps |grep Main |cut -f1 -d" " | xargs kill -9 > /dev/null 2>&1) || true
+ (jps |grep Main |cut -f1 -d" " | xargs kill -9 > /dev/null 2>&1) || true
- cd ${S1AS_HOME}/domains/domain1/config/
- sed "s/1527/${DB_PORT}/g" domain.xml > domain.xml.replaced
- mv domain.xml.replaced domain.xml
- grep PortNumber domain.xml
+ cd ${S1AS_HOME}/domains/domain1/config/
+ sed "s/1527/${DB_PORT}/g" domain.xml > domain.xml.replaced
+ mv domain.xml.replaced domain.xml
+ grep PortNumber domain.xml
- cd ${APS_HOME}/config
- (rm derby.properties.replaced > /dev/null 2>&1) || true
- sed "s/1527/${DB_PORT}/g" derby.properties > derby.properties.replaced
- rm derby.properties
- sed "s/1528/${DB_PORT_2}/g" derby.properties.replaced > derby.properties
- cat derby.properties
- cd ${APS_HOME}/devtests/ejb
- rm count.txt || true
- ant ${TARGET} report-result -Ddb.port=${DB_PORT} -Ddb.port.2=${DB_PORT_2} |tee $TEST_RUN_LOG
- cat ${S1AS_HOME}/databases/derby.log
- egrep 'DID NOT RUN= *0' count.txt || true
+ cd ${APS_HOME}/config
+ (rm derby.properties.replaced > /dev/null 2>&1) || true
+ sed "s/1527/${DB_PORT}/g" derby.properties > derby.properties.replaced
+ rm derby.properties
+ sed "s/1528/${DB_PORT_2}/g" derby.properties.replaced > derby.properties
+ cat derby.properties
+ cd ${APS_HOME}/devtests/ejb
+ rm count.txt || true
+ ant ${TARGET} report-result -Ddb.port=${DB_PORT} -Ddb.port.2=${DB_PORT_2} |tee $TEST_RUN_LOG
+ cat ${S1AS_HOME}/databases/derby.log
+ egrep 'DID NOT RUN= *0' count.txt || true
}
test_run_ejb_timer_cluster(){
- rm -rf ${S1AS_HOME}/domains/domain1
+ rm -rf ${S1AS_HOME}/domains/domain1
- export ADMIN_PORT=45707 \
- JMS_PORT=45708 \
- JMX_PORT=45709 \
- ORB_PORT=45710 \
- SSL_PORT=45711 \
- INSTANCE_PORT=45712 \
- INSTANCE_HTTP_PORT=45721 \
- INSTANCE_HTTPS_PORT=45718 \
- INSTANCE_PORT_2=45719 \
- INSTANCE_PORT_3=45720 \
- ALTERNATE_PORT=45713 \
- ORB_SSL_PORT=45714 \
- ORB_SSL_MUTUALAUTH_PORT=45715 \
- DB_PORT=45716 \
- DB_PORT_2=45717
- env
+ export ADMIN_PORT=45707 \
+ JMS_PORT=45708 \
+ JMX_PORT=45709 \
+ ORB_PORT=45710 \
+ SSL_PORT=45711 \
+ INSTANCE_PORT=45712 \
+ INSTANCE_HTTP_PORT=45721 \
+ INSTANCE_HTTPS_PORT=45718 \
+ INSTANCE_PORT_2=45719 \
+ INSTANCE_PORT_3=45720 \
+ ALTERNATE_PORT=45713 \
+ ORB_SSL_PORT=45714 \
+ ORB_SSL_MUTUALAUTH_PORT=45715 \
+ DB_PORT=45716 \
+ DB_PORT_2=45717
+ env
- cd ${APS_HOME}
+ cd ${APS_HOME}
- echo "AS_ADMIN_PASSWORD=" > temppwd
- cat ${APS_HOME}/temppwd
- ${S1AS_HOME}/bin/asadmin \
- --user anonymous \
- --passwordfile ${APS_HOME}/temppwd \
- create-domain \
- --adminport ${ADMIN_PORT} \
- --domainproperties jms.port=${JMS_PORT}:domain.jmxPort=${JMX_PORT}:orb.listener.port=${ORB_PORT}:http.ssl.port=${SSL_PORT}:orb.ssl.port=${ORB_SSL_PORT}:orb.mutualauth.port=${ORB_SSL_MUTUALAUTH_PORT} \
- --instanceport ${INSTANCE_PORT} \
- domain1
+ echo "AS_ADMIN_PASSWORD=" > temppwd
+ cat ${APS_HOME}/temppwd
+ ${S1AS_HOME}/bin/asadmin \
+ --user anonymous \
+ --passwordfile ${APS_HOME}/temppwd \
+ create-domain \
+ --adminport ${ADMIN_PORT} \
+ --domainproperties jms.port=${JMS_PORT}:domain.jmxPort=${JMX_PORT}:orb.listener.port=${ORB_PORT}:http.ssl.port=${SSL_PORT}:orb.ssl.port=${ORB_SSL_PORT}:orb.mutualauth.port=${ORB_SSL_MUTUALAUTH_PORT} \
+ --instanceport ${INSTANCE_PORT} \
+ domain1
- # Create
- echo "admin.domain=domain1
- admin.domain.dir=\${env.S1AS_HOME}/domains
- admin.port=${ADMIN_PORT}
- admin.user=anonymous
- admin.host=localhost
- http.port=${INSTANCE_PORT}
- https.port=${SSL_PORT}
- instance.http.port=${INSTANCE_HTTP_PORT}
- instance.https.port=${INSTANCE_HTTPS_PORT}
- http.host=localhost
- http.address=127.0.0.1
- http.alternate.port=${ALTERNATE_PORT}
- orb.port=${ORB_PORT}
- admin.password=
- ssl.password=changeit
- master.password=changeit
- admin.password.file=\${env.APS_HOME}/config/adminpassword.txt
- appserver.instance.name=server
- config.dottedname.prefix=server
- resources.dottedname.prefix=domain.resources
- results.mailhost=localhost
- results.mailer=QLTestsForPEInstallOrDASInEEInstall@sun.com
- results.mailee=yourname@sun.com
- autodeploy.dir=\${env.S1AS_HOME}/domains/\${admin.domain}/autodeploy
- precompilejsp=true
- jvm.maxpermsize=192m
- appserver.instance.dir=\${admin.domain.dir}/\${admin.domain}" > config.properties
+ # Create
+ echo "admin.domain=domain1
+ admin.domain.dir=\${env.S1AS_HOME}/domains
+ admin.port=${ADMIN_PORT}
+ admin.user=anonymous
+ admin.host=localhost
+ http.port=${INSTANCE_PORT}
+ https.port=${SSL_PORT}
+ instance.http.port=${INSTANCE_HTTP_PORT}
+ instance.https.port=${INSTANCE_HTTPS_PORT}
+ http.host=localhost
+ http.address=127.0.0.1
+ http.alternate.port=${ALTERNATE_PORT}
+ orb.port=${ORB_PORT}
+ admin.password=
+ ssl.password=changeit
+ master.password=changeit
+ admin.password.file=\${env.APS_HOME}/config/adminpassword.txt
+ appserver.instance.name=server
+ config.dottedname.prefix=server
+ resources.dottedname.prefix=domain.resources
+ results.mailhost=localhost
+ results.mailer=QLTestsForPEInstallOrDASInEEInstall@sun.com
+ results.mailee=yourname@sun.com
+ autodeploy.dir=\${env.S1AS_HOME}/domains/\${admin.domain}/autodeploy
+ precompilejsp=true
+ jvm.maxpermsize=192m
+ appserver.instance.dir=\${admin.domain.dir}/\${admin.domain}" > config.properties
- (jps |grep Main |cut -f1 -d" " | xargs kill -9 > /dev/null 2>&1) || true
+ (jps |grep Main |cut -f1 -d" " | xargs kill -9 > /dev/null 2>&1) || true
- cd ${S1AS_HOME}/domains/domain1/config/
- sed "s/1527/${DB_PORT}/g" domain.xml > domain.xml.replaced
- mv domain.xml.replaced domain.xml
- grep PortNumber domain.xml
+ cd ${S1AS_HOME}/domains/domain1/config/
+ sed "s/1527/${DB_PORT}/g" domain.xml > domain.xml.replaced
+ mv domain.xml.replaced domain.xml
+ grep PortNumber domain.xml
- cd ${APS_HOME}/config
- (rm derby.properties.replaced > /dev/null 2>&1) || true
- sed "s/1527/${DB_PORT}/g" derby.properties > derby.properties.replaced
- rm derby.properties
- sed "s/1528/${DB_PORT_2}/g" derby.properties.replaced > derby.properties
- cat derby.properties
+ cd ${APS_HOME}/config
+ (rm derby.properties.replaced > /dev/null 2>&1) || true
+ sed "s/1527/${DB_PORT}/g" derby.properties > derby.properties.replaced
+ rm derby.properties
+ sed "s/1528/${DB_PORT_2}/g" derby.properties.replaced > derby.properties
+ cat derby.properties
- pushd ${APS_HOME}/devtests/ejb/ee/timer
+ pushd ${APS_HOME}/devtests/ejb/ee/timer
- ant ${TARGET} |tee ${TEST_RUN_LOG}
- antStatus=${?}
- ant dev-report
+ ant ${TARGET} |tee ${TEST_RUN_LOG}
+ antStatus=${?}
+ ant dev-report
}
get_test_target(){
- case $1 in
- ejb_all|ejb_timer_cluster_all )
- TARGET=all ;;
- ejb_web_all)
- TARGET=lite ;;
+ case $1 in
+ ejb_all|ejb_timer_cluster_all )
+ TARGET=all ;;
+ ejb_web_all)
+ TARGET=lite ;;
* )
TARGET=$1 ;;
- esac
- export TARGET
+ esac
+ export TARGET
}
run_test_id(){
- if [[ ${1} = "ejb_web_all" ]]; then
- unzip_test_resources ${WORKSPACE}/bundles/web.zip
- else
- unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
- fi
- dname=`pwd`
- cd `dirname ${0}`
- test_init
- get_test_target ${1}
- if [[ ${1} = "ejb_all" || ${1} = "ejb_group"* ]]; then
- test_run_ejb
- elif [[ ${1} = "ejb_timer_cluster_all" ]]; then
- test_run_ejb_timer_cluster
- elif [[ ${1} = "ejb_web_all" ]]; then
- test_run_ejb_web
- else
- echo "Invalid Test ID"
- exit 1
- fi
- check_successful_run
+ if [[ ${1} = "ejb_web_all" ]]; then
+ unzip_test_resources ${WORKSPACE}/bundles/web.zip
+ else
+ unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
+ fi
+ dname=`pwd`
+ cd `dirname ${0}`
+ test_init
+ get_test_target ${1}
+ if [[ ${1} = "ejb_all" || ${1} = "ejb_group"* ]]; then
+ test_run_ejb
+ elif [[ ${1} = "ejb_timer_cluster_all" ]]; then
+ test_run_ejb_timer_cluster
+ elif [[ ${1} = "ejb_web_all" ]]; then
+ test_run_ejb_web
+ else
+ echo "Invalid Test ID"
+ exit 1
+ fi
+ check_successful_run
generate_junit_report ${1}
change_junit_report_class_names
}
list_test_ids(){
- echo ejb_all ejb_timer_cluster_all ejb_web_all ejb_group_1 ejb_group_2 ejb_group_3
+ echo ejb_all ejb_timer_cluster_all ejb_web_all ejb_group_1 ejb_group_2 ejb_group_3
}
OPT=${1}
@@ -302,9 +302,9 @@
source `dirname ${0}`/../../../common_test.sh
case ${OPT} in
- list_test_ids )
- list_test_ids;;
- run_test_id )
- trap "copy_test_artifacts ${TEST_ID}" EXIT
- run_test_id ${TEST_ID} ;;
+ list_test_ids )
+ list_test_ids;;
+ run_test_id )
+ trap "copy_test_artifacts ${TEST_ID}" EXIT
+ run_test_id ${TEST_ID} ;;
esac
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/build.xml
index ec74550..974f667 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/build.xml
@@ -47,11 +47,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-sfsb tests)
- ant passivateactivate (Executes the ejb-sfsb-passivateactivate test)
- ant cacheNPE (Executes the ejb-sfsb-cacheNPE test)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-sfsb tests)
+ ant passivateactivate (Executes the ejb-sfsb-passivateactivate test)
+ ant cacheNPE (Executes the ejb-sfsb-cacheNPE test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.properties b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.properties
index a8845e4..6cad404 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-sfsb-cacheNPE"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.xml
index 971f9c6..5fd9a47 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<!--
<antcall target="execute-ejb-sql-common">
@@ -71,7 +71,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -89,18 +89,18 @@
</antcall>
<antcall target="runclient-common"/>
</target>
-
-
+
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
index 7cf5e8e..5b6948d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private ArrayList sfsbList = new ArrayList();
@@ -50,13 +50,13 @@
client.doTest();
System.out.println("[cacheNPEClient] DONE doTest()...");
stat.printSummary("cacheNPE");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(0,4); //create SFSBs
+ initSFSBList(0,4); //create SFSBs
for( int j = 0; j < 400; j++) {
accessSFSB(0,3,5);
@@ -67,13 +67,13 @@
} catch (Exception ex ) {
System.out.println ( "Exception caught : " + ex );
ex.printStackTrace();
- }
+ }
removeSFSB(3);
removeSFSB(2);
accessSFSB(1,4,5);
- initSFSBList(5,20); //create SFSBs
+ initSFSBList(5,20); //create SFSBs
}
@@ -109,7 +109,7 @@
for (; i < MAXSFSBS; i=i+step) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = sfsb.getName();
-
+
boolean sessionCtxTest = sfsb.checkSessionContext();
boolean initialCtxTest = sfsb.checkInitialContext();
boolean entityHomeTest = sfsb.checkEntityHome();
@@ -120,11 +120,11 @@
boolean handleTest = sfsb.checkHandle();
boolean utTest = sfsb.checkUserTransaction();
- System.out.println("In accessSFSB: for bean -> " + sfsbName
+ System.out.println("In accessSFSB: for bean -> " + sfsbName
+ "; " + sessionCtxTest + "; " + initialCtxTest
+ "; " + entityHomeTest + "; " + entityLocalHomeTest
+ "; " + entityRemoteTest + "; " + entityLocalTest
- + "; " + homeHandleTest + "; " + handleTest
+ + "; " + homeHandleTest + "; " + handleTest
+ "; " + utTest);
passed = sessionCtxTest && initialCtxTest
@@ -136,7 +136,7 @@
break;
}
}
-
+
if (passed) {
stat.addStatus("ejbclient accessSFSBs", stat.PASS);
@@ -159,7 +159,7 @@
ex.printStackTrace();
stat.addStatus("ejbclient removeSFSBs", stat.FAIL);
return;
- }
+ }
stat.addStatus("ejbclient removeSFSBs", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java
index f9de77c..42a41a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java
@@ -23,35 +23,35 @@
extends EJBObject
{
- public String getName()
+ public String getName()
throws RemoteException;
- public String getMessage()
+ public String getMessage()
throws RemoteException;
public boolean checkSessionContext()
- throws RemoteException;
+ throws RemoteException;
public boolean checkInitialContext()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityHome()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityLocalHome()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityRemoteRef()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityLocalRef()
- throws RemoteException;
+ throws RemoteException;
public boolean checkHomeHandle()
- throws RemoteException;
+ throws RemoteException;
public boolean checkHandle()
- throws RemoteException;
+ throws RemoteException;
public boolean checkUserTransaction()
throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java
index 10ce354..3c21b3f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private Context envCtx;
private Context envSubCtx;
@@ -64,7 +64,7 @@
homeHandle = entityHome.getHomeHandle();
handle = entityRemote.getHandle();
-
+
userTransaction1 = sessionCtx.getUserTransaction();
userTransaction2 = (UserTransaction) new InitialContext().
lookup("java:comp/UserTransaction");
@@ -173,7 +173,7 @@
public boolean checkUserTransaction() {
boolean status =
((userTransaction1 != null) && (userTransaction2 != null));
-
+
try {
if( status ) {
userTransaction1.begin();
@@ -205,7 +205,7 @@
}
if (ok) {
fieldName = "java:";
- ok = ( (javaCtx != null) &&
+ ok = ( (javaCtx != null) &&
javaCtx.getNameInNamespace().equals(fieldName) );
}
if (ok) {
@@ -217,7 +217,7 @@
fieldName = "java:comp/env";
ok = ( (envCtx != null) &&
envCtx.getNameInNamespace().equals(fieldName) );
-
+
}
if (ok) {
fieldName = "java:comp/env/ejb";
@@ -226,7 +226,7 @@
}
if (ok) {
fieldName = "env-entry";
-
+
String value1 = (String)
initialCtx.lookup("java:comp/env/TagValue");
String value2 = (String) envCtx.lookup("TagValue");
@@ -238,9 +238,9 @@
ex.printStackTrace();
ok = false;
}
-
+
this.message = (ok) ? null : (fieldName + " not restored properly");
-
+
return ok;
}
@@ -268,7 +268,7 @@
public void ejbRemove() {
System.out.println ("\n\tIn SFSB.ejbRemove() for name -> " + sfsbName);
try {
- entityRemote.remove();
+ entityRemote.remove();
} catch (Exception ex) {
ex.printStackTrace();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java
index 2a457eb..bb3fd4c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java
@@ -23,6 +23,6 @@
public interface SFSBHome
extends EJBHome
{
- public SFSB create(String sfsbName)
+ public SFSB create(String sfsbName)
throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java
index b9a73d0..1251f92 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java
@@ -56,8 +56,8 @@
Connection c = null;
PreparedStatement ps = null;
try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"INSERT INTO SimpleEntity (keyid, name) VALUES (?,?)");
ps.setString(1, key);
ps.setString(2, name);
@@ -68,7 +68,7 @@
this.name = name;
} catch (SQLException e) {
throw new CreateException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -94,10 +94,10 @@
throws FinderException
{
Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"SELECT keyid from SimpleEntity where keyid = ?");
ps.setString(1, key);
ResultSet rs = ps.executeQuery();
@@ -107,7 +107,7 @@
return key;
} catch (SQLException e) {
throw new FinderException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -125,68 +125,68 @@
ps = c.prepareStatement(
"SELECT name from SimpleEntity where keyid = ?");
ps.setString(1, key);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + key);
- this.name = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + key);
+ this.name = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE SimpleEntity SET name = ? WHERE keyid = ?");
- ps.setString(1, name);
- ps.setString(2, key);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE SimpleEntity SET name = ? WHERE keyid = ?");
+ ps.setString(1, name);
+ ps.setString(2, key);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
System.out.println("[**SimpleEntityBean**] ejbRemove called for key = " + this.key);
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM SimpleEntity WHERE keyid = ?");
- ps.setString(1, name);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- System.out.println("[**SimpleEntityBean**] ejbRemove for key = "
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM SimpleEntity WHERE keyid = ?");
+ ps.setString(1, name);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ System.out.println("[**SimpleEntityBean**] ejbRemove for key = "
+ this.key + " succeeded");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/create_pointbase.sql
index b14c736..74b1686 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- keyid char(20) not null,
- name char(20)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ keyid char(20) not null,
+ name char(20)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.properties b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.properties
index d741a6b..f84594d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-sfsb-keepstate"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.xml
index 4cd7f27..200d3ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
index 02d4cec..0e02d51 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 40;
@@ -53,23 +53,23 @@
client.doTest();
System.out.println("[keepstateClient] DONE doTest()...");
stat.printSummary("keepstate");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
- System.out.println("Waiting for 15 seconds before accessing...");
- for (int i=0; i<15; i++) {
- System.out.println("" + (15 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ initSFSBList(); //create SFSBs
+ System.out.println("Waiting for 15 seconds before accessing...");
+ for (int i=0; i<15; i++) {
+ System.out.println("" + (15 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
accessSFSB(); //access the SFBS
- removeTest();
+ removeTest();
}
private void initSFSBList() {
@@ -99,21 +99,21 @@
public void accessSFSB() {
try {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
boolean passed = true;
for (int i=0; i < MAX_SFSBS; i++) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
- String retrievedName = sfsb.getName();
-
+ String retrievedName = sfsb.getName();
+
boolean sessionCtxTest = sfsb.checkSessionContext();
boolean initialCtxTest = sfsb.checkInitialContext();
boolean entityHomeTest = sfsb.checkEntityHome();
@@ -123,33 +123,33 @@
boolean homeHandleTest = sfsb.checkHomeHandle();
boolean handleTest = sfsb.checkHandle();
boolean utTest = sfsb.checkUserTransaction();
- boolean activationTest = (sfsb.getActivationCount() != 0);
- boolean passivationTest = (sfsb.getPassivationCount() != 0);
+ boolean activationTest = (sfsb.getActivationCount() != 0);
+ boolean passivationTest = (sfsb.getPassivationCount() != 0);
- int actCount = sfsb.getActivationCount();
- int pasCount = sfsb.getPassivationCount();
+ int actCount = sfsb.getActivationCount();
+ int pasCount = sfsb.getPassivationCount();
System.out.println("SFSB[" + i + "/" + MAX_SFSBS + "]: " + sessionCtxTest + "; " + initialCtxTest
+ "; " + entityHomeTest + "; " + entityLocalHomeTest
+ "; " + entityRemoteTest + "; " + entityLocalTest
- + "; " + homeHandleTest + "; " + handleTest
+ + "; " + homeHandleTest + "; " + handleTest
+ "; " + utTest
- + "; " + activationTest + " (" + actCount + ")"
- + "; " + passivationTest + " (" + pasCount + ")"
- );
+ + "; " + activationTest + " (" + actCount + ")"
+ + "; " + passivationTest + " (" + pasCount + ")"
+ );
passed = sessionCtxTest && initialCtxTest
&& entityHomeTest && entityLocalHomeTest
&& entityRemoteTest && entityLocalTest
&& homeHandleTest && handleTest && utTest
- && activationTest && passivationTest;
+ && activationTest && passivationTest;
/*
if (! passed) {
break;
}
*/
- sfsb.sleepForSeconds(2);
+ sfsb.sleepForSeconds(2);
}
if (passed) {
@@ -163,44 +163,44 @@
String sfsbName = _sfsbPrefix+i;
sfsb.makeStateNonSerializable();
- }
+ }
- //Creating these many SFSBs should force passivation of the above
- // non-serializable beans
+ //Creating these many SFSBs should force passivation of the above
+ // non-serializable beans
for (int i=0; i < MAX_SFSBS; i++) {
- home.create(_sfsbPrefix + (i+1)*1000);
- }
+ home.create(_sfsbPrefix + (i+1)*1000);
+ }
- System.out.println("Waiting for 10 seconds for passivation to complete...");
+ System.out.println("Waiting for 10 seconds for passivation to complete...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
for (int i=0; i < MAX_SFSBS; i++) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
try {
- System.out.print("Expecting exception for: " + sfsbName);
- String nm = sfsb.getName();
- System.out.println("ERROR. Didn't get expected exception. "
- + "Got: " + nm);
- passed = false;
- break;
- } catch (Exception ex) {
- System.out.println("[**Got Exception**]");
- }
- }
- if (passed) {
- stat.addStatus("ejbclient non-serializable-state", stat.PASS);
- } else {
- stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
- }
+ System.out.print("Expecting exception for: " + sfsbName);
+ String nm = sfsb.getName();
+ System.out.println("ERROR. Didn't get expected exception. "
+ + "Got: " + nm);
+ passed = false;
+ break;
+ } catch (Exception ex) {
+ System.out.println("[**Got Exception**]");
+ }
+ }
+ if (passed) {
+ stat.addStatus("ejbclient non-serializable-state", stat.PASS);
+ } else {
+ stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
+ }
} catch (Exception ex) {
stat.addStatus("ejbclient accessSFSB", stat.FAIL);
@@ -209,26 +209,26 @@
public void removeTest() {
- SFSB sfsb = null;
- try {
- String myName = "_2_" + _sfsbPrefix + "_2_";
- sfsb = (SFSB) home.create(myName);
- String retrievedName = sfsb.getName();
- boolean nameOK = myName.equalsIgnoreCase(retrievedName);
- boolean gotException = false;
- sfsb.remove();
- try {
- sfsb.getName();
- gotException = false; //Expecting an exception
- } catch (Exception ex) {
- gotException = true;
- }
+ SFSB sfsb = null;
+ try {
+ String myName = "_2_" + _sfsbPrefix + "_2_";
+ sfsb = (SFSB) home.create(myName);
+ String retrievedName = sfsb.getName();
+ boolean nameOK = myName.equalsIgnoreCase(retrievedName);
+ boolean gotException = false;
+ sfsb.remove();
+ try {
+ sfsb.getName();
+ gotException = false; //Expecting an exception
+ } catch (Exception ex) {
+ gotException = true;
+ }
- String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
+ String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
if (nameOK && gotException) {
stat.addStatus("ejbclient removeTest " + resultStr, stat.PASS);
} else {
- stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
+ stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
}
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/descriptor/sun-ejb-jar.xml
index 478d449..1f0bbdd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/descriptor/sun-ejb-jar.xml
@@ -29,7 +29,7 @@
</ejb-ref>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
</ejb>
<ejb>
@@ -47,10 +47,10 @@
<res-ref-name>jdbc/DataSource</res-ref-name>
<jndi-name>jdbc/__default</jndi-name>
</resource-ref>
- <bean-pool>
- <steady-pool-size>4</steady-pool-size>
- <max-pool-size>17</max-pool-size>
- </bean-pool>
+ <bean-pool>
+ <steady-pool-size>4</steady-pool-size>
+ <max-pool-size>17</max-pool-size>
+ </bean-pool>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java
index 5e697cd..32ca8ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java
@@ -24,37 +24,37 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
- public void createSFSBChild()
- throws RemoteException;
+ public void createSFSBChild()
+ throws RemoteException;
public String getMessage()
- throws RemoteException;
+ throws RemoteException;
public boolean checkSessionContext()
- throws RemoteException;
+ throws RemoteException;
public boolean checkInitialContext()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityHome()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityLocalHome()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityRemoteRef()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityLocalRef()
- throws RemoteException;
+ throws RemoteException;
public boolean checkHomeHandle()
- throws RemoteException;
+ throws RemoteException;
public boolean checkHandle()
- throws RemoteException;
+ throws RemoteException;
public boolean checkUserTransaction()
throws RemoteException;
@@ -63,17 +63,17 @@
throws RemoteException;
public int getActivationCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivationCount()
- throws RemoteException;
+ throws RemoteException;
public void makeStateNonSerializable()
- throws RemoteException;
+ throws RemoteException;
public void sleepForSeconds(int sec)
- throws RemoteException;
+ throws RemoteException;
public void unusedMethod()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java
index 6f06dec..42f4fd2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -51,7 +51,7 @@
private SimpleEntityLocalHome entityLocalHome;
private SimpleEntityLocal entityLocal;
private SFSBHome sfsbHome;
- private SFSB sfsbRemote;
+ private SFSB sfsbRemote;
private SFSBLocalHome sfsbLocalHome;
private SFSBLocal sfsbLocal;
@@ -60,9 +60,9 @@
private UserTransaction userTransaction1;
private UserTransaction userTransaction2;
- private int activationCount;
- private int passivationCount;
- private Object nonSerializableState;
+ private int activationCount;
+ private int passivationCount;
+ private Object nonSerializableState;
public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
@@ -75,10 +75,10 @@
sfsbHome = (SFSBHome) sessionCtx.getEJBHome();
sfsbLocalHome = (SFSBLocalHome) sessionCtx.getEJBLocalHome();
-
+
homeHandle = entityHome.getHomeHandle();
handle = entityRemote.getHandle();
-
+
userTransaction1 = sessionCtx.getUserTransaction();
userTransaction2 = (UserTransaction) new InitialContext().
lookup("java:comp/UserTransaction");
@@ -98,15 +98,15 @@
sfsbRemote = sfsbHome.create(sfsbName + " _child");
sfsbLocal = sfsbLocalHome.create(sfsbName + LOCAL_CHILD_SUFFIX);
} catch(Exception e) {
- EJBException ex = new EJBException(e.getMessage());
- ex.initCause(e);
+ EJBException ex = new EJBException(e.getMessage());
+ ex.initCause(e);
throw ex;
}
}
public boolean checkSFSBChild() {
String childName = sfsbLocal.getName();
- boolean status = childName.equals(sfsbName + LOCAL_CHILD_SUFFIX);
+ boolean status = childName.equals(sfsbName + LOCAL_CHILD_SUFFIX);
return status;
}
@@ -203,7 +203,7 @@
public boolean checkUserTransaction() {
boolean status =
((userTransaction1 != null) && (userTransaction2 != null));
-
+
try {
if( status ) {
userTransaction1.begin();
@@ -235,7 +235,7 @@
}
if (ok) {
fieldName = "java:";
- ok = ( (javaCtx != null) &&
+ ok = ( (javaCtx != null) &&
javaCtx.getNameInNamespace().equals(fieldName) );
}
if (ok) {
@@ -247,7 +247,7 @@
fieldName = "java:comp/env";
ok = ( (envCtx != null) &&
envCtx.getNameInNamespace().equals(fieldName) );
-
+
}
if (ok) {
fieldName = "java:comp/env/ejb";
@@ -256,7 +256,7 @@
}
if (ok) {
fieldName = "env-entry";
-
+
String value1 = (String)
initialCtx.lookup("java:comp/env/TagValue");
String value2 = (String) envCtx.lookup("TagValue");
@@ -268,9 +268,9 @@
ex.printStackTrace();
ok = false;
}
-
+
this.message = (ok) ? null : (fieldName + " not restored properly");
-
+
return ok;
}
@@ -279,22 +279,22 @@
}
public int getActivationCount() {
- return this.activationCount;
+ return this.activationCount;
}
public int getPassivationCount() {
- return this.passivationCount;
+ return this.passivationCount;
}
public void makeStateNonSerializable() {
- nonSerializableState = new Object();
+ nonSerializableState = new Object();
}
public void sleepForSeconds(int sec) {
- try {
- Thread.currentThread().sleep(sec * 1000);
- } catch (Exception ex) {
- }
+ try {
+ Thread.currentThread().sleep(sec * 1000);
+ } catch (Exception ex) {
+ }
}
public void unusedMethod() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java
index fa34638..a40e68d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java
@@ -23,6 +23,6 @@
public interface SFSBHome
extends EJBHome
{
- public SFSB create(String sfsbName)
+ public SFSB create(String sfsbName)
throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java
index 76ce881..8defae6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java
@@ -21,5 +21,5 @@
public interface SFSBLocal
extends EJBLocalObject
{
- public String getName();
+ public String getName();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java
index 0502a12..477c836 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java
@@ -22,6 +22,6 @@
public interface SFSBLocalHome
extends EJBLocalHome
{
- public SFSBLocal create(String sfsbName)
+ public SFSBLocal create(String sfsbName)
throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java
index 4e5612c..841378b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java
@@ -56,8 +56,8 @@
Connection c = null;
PreparedStatement ps = null;
try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"INSERT INTO SimpleEntity (keyid, name) VALUES (?,?)");
ps.setString(1, key);
ps.setString(2, name);
@@ -68,7 +68,7 @@
this.name = name;
} catch (SQLException e) {
throw new CreateException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -94,10 +94,10 @@
throws FinderException
{
Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"SELECT keyid from SimpleEntity where keyid = ?");
ps.setString(1, key);
ResultSet rs = ps.executeQuery();
@@ -107,7 +107,7 @@
return key;
} catch (SQLException e) {
throw new FinderException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -125,65 +125,65 @@
ps = c.prepareStatement(
"SELECT name from SimpleEntity where keyid = ?");
ps.setString(1, key);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + key);
- this.name = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + key);
+ this.name = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE SimpleEntity SET name = ? WHERE keyid = ?");
- ps.setString(1, name);
- ps.setString(2, key);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE SimpleEntity SET name = ? WHERE keyid = ?");
+ ps.setString(1, name);
+ ps.setString(2, key);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM SimpleEntity WHERE keyid = ?");
- ps.setString(1, name);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM SimpleEntity WHERE keyid = ?");
+ ps.setString(1, name);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.properties b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.properties
index d708719..41387ac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-sfsb-lifecycle"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.xml
index 9a14c5a..746ba95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
index 4f182ae..9ee7706 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
@@ -33,8 +33,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 24;
@@ -52,15 +52,15 @@
client.doTest();
System.out.println("[lfTraditional] DONE doTest()...");
stat.printSummary("passivateactivate");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
accessSFSB(); //access the SFBS
- removeTest();
+ removeTest();
}
private void initSFSBList() {
@@ -90,47 +90,47 @@
public void accessSFSB() {
try {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
boolean passed = true;
for (int i=0; i < MAX_SFSBS; i++) {
try {
- SFSB sfsb = (SFSB) sfsbList.get(i);
+ SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
- String retrievedName = sfsb.getName();
-
- boolean ok = sfsb.isOK(sfsbName);
- int actCount = sfsb.getActivationCount();
- int pasCount = sfsb.getPassivationCount();
+ String retrievedName = sfsb.getName();
- boolean activationTest = (actCount != 0);
- boolean passivationTest = (pasCount != 0);
+ boolean ok = sfsb.isOK(sfsbName);
+ int actCount = sfsb.getActivationCount();
+ int pasCount = sfsb.getPassivationCount();
+
+ boolean activationTest = (actCount != 0);
+ boolean passivationTest = (pasCount != 0);
System.out.println("Bean[" + i + "/" + MAX_SFSBS + "] name: " + sfsbName
- + "; retrievedName: " + retrievedName
- + "; ok: " + ok
- + "; " + activationTest + " (" + actCount + ")"
- + "; " + passivationTest + " (" + pasCount + ")"
- );
+ + "; retrievedName: " + retrievedName
+ + "; ok: " + ok
+ + "; " + activationTest + " (" + actCount + ")"
+ + "; " + passivationTest + " (" + pasCount + ")"
+ );
passed = passed & sfsbName.equals(retrievedName)
&& ok
- && activationTest && passivationTest;
+ && activationTest && passivationTest;
if (! passed) {
//break;
}
- sfsb.sleepForSeconds(1);
- } catch (Exception ex) {
- System.out.println("Bean[" + i + "] Got exception: " + ex);
- }
+ sfsb.sleepForSeconds(1);
+ } catch (Exception ex) {
+ System.out.println("Bean[" + i + "] Got exception: " + ex);
+ }
}
if (passed) {
@@ -144,44 +144,44 @@
String sfsbName = _sfsbPrefix+i;
sfsb.makeStateNonSerializable();
- }
+ }
- //Creating these many SFSBs should force passivation of the above
- // non-serializable beans
+ //Creating these many SFSBs should force passivation of the above
+ // non-serializable beans
for (int i=0; i < MAX_SFSBS; i++) {
- home.create(_sfsbPrefix + (i+1)*1000);
- }
+ home.create(_sfsbPrefix + (i+1)*1000);
+ }
- System.out.println("Waiting for 10 seconds for passivation to complete...");
+ System.out.println("Waiting for 10 seconds for passivation to complete...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
for (int i=0; i < MAX_SFSBS; i++) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
try {
- System.out.print("Expecting exception for: " + sfsbName);
- String nm = sfsb.getName();
- System.out.println("ERROR. Didn't get expected exception. "
- + "Got: " + nm);
- passed = false;
- break;
- } catch (Exception ex) {
- System.out.println("[**Got Exception**]");
- }
- }
- if (passed) {
- stat.addStatus("ejbclient non-serializable-state", stat.PASS);
- } else {
- stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
- }
+ System.out.print("Expecting exception for: " + sfsbName);
+ String nm = sfsb.getName();
+ System.out.println("ERROR. Didn't get expected exception. "
+ + "Got: " + nm);
+ passed = false;
+ break;
+ } catch (Exception ex) {
+ System.out.println("[**Got Exception**]");
+ }
+ }
+ if (passed) {
+ stat.addStatus("ejbclient non-serializable-state", stat.PASS);
+ } else {
+ stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
+ }
} catch (Exception ex) {
stat.addStatus("ejbclient accessSFSB", stat.FAIL);
@@ -190,28 +190,28 @@
public void removeTest() {
- SFSB sfsb = null;
- try {
- String myName = "_2_" + _sfsbPrefix + "_2_";
- sfsb = (SFSB) home.create(myName);
- String retrievedName = sfsb.getName();
- boolean nameOK = myName.equalsIgnoreCase(retrievedName);
- boolean gotException = false;
- sfsb.remove();
- Exception excep = null;
- try {
- sfsb.getName();
- gotException = false; //Expecting an exception
- } catch (Exception ex) {
- gotException = true;
- excep = ex;
- }
+ SFSB sfsb = null;
+ try {
+ String myName = "_2_" + _sfsbPrefix + "_2_";
+ sfsb = (SFSB) home.create(myName);
+ String retrievedName = sfsb.getName();
+ boolean nameOK = myName.equalsIgnoreCase(retrievedName);
+ boolean gotException = false;
+ sfsb.remove();
+ Exception excep = null;
+ try {
+ sfsb.getName();
+ gotException = false; //Expecting an exception
+ } catch (Exception ex) {
+ gotException = true;
+ excep = ex;
+ }
- String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
+ String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
if (nameOK && gotException) {
stat.addStatus("ejbclient removeTest " + resultStr, stat.PASS);
} else {
- stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
+ stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
}
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/descriptor/sun-ejb-jar.xml
index 9ecf001..3f6e1a9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/descriptor/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<jndi-name>ejb/ejb_sfsb_lifecycle_SFSB</jndi-name>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java
index 9a11488..2bf9fff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java
@@ -24,23 +24,23 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public int getActivationCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivationCount()
- throws RemoteException;
+ throws RemoteException;
public void makeStateNonSerializable()
- throws RemoteException;
+ throws RemoteException;
public void sleepForSeconds(int sec)
- throws RemoteException;
+ throws RemoteException;
public boolean isOK(String name)
- throws RemoteException;
+ throws RemoteException;
public void unusedMethod()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java
index 838a5af..8e86033 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java
@@ -32,7 +32,7 @@
@CallbackListener("com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb.LifecycleListener")
@Stateful
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private Context envCtx;
@@ -48,7 +48,7 @@
private String sfsbName;
private String envEntryTagValue;
private SFSBHome sfsbHome;
- private SFSB sfsbRemote;
+ private SFSB sfsbRemote;
private SFSBLocalHome sfsbLocalHome;
private SFSBLocal sfsbLocal;
@@ -57,9 +57,9 @@
private UserTransaction userTransaction1;
private UserTransaction userTransaction2;
- private int activationCount;
- private int passivationCount;
- private Object nonSerializableState;
+ private int activationCount;
+ private int passivationCount;
+ private Object nonSerializableState;
public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
@@ -68,13 +68,13 @@
try {
sfsbHome = (SFSBHome) sessionCtx.getEJBHome();
sfsbLocalHome = (SFSBLocalHome) sessionCtx.getEJBLocalHome();
-
+
homeHandle = sfsbHome.getHomeHandle();
handle = sessionCtx.getEJBObject().getHandle();
-
+
userTransaction1 = sessionCtx.getUserTransaction();
userTransaction2 = (UserTransaction) new InitialContext().
- lookup("java:comp/UserTransaction");
+ lookup("java:comp/UserTransaction");
} catch (Exception ex) {
ex.printStackTrace();
//TODO
@@ -133,7 +133,7 @@
public boolean checkUserTransaction() {
boolean status =
((userTransaction1 != null) && (userTransaction2 != null));
-
+
try {
if( status ) {
userTransaction1.begin();
@@ -184,9 +184,9 @@
ex.printStackTrace();
ok = false;
}
-
+
this.message = (ok) ? null : (fieldName + " not restored properly");
-
+
return ok;
}
@@ -195,22 +195,22 @@
}
public int getActivationCount() {
- return this.activationCount;
+ return this.activationCount;
}
public int getPassivationCount() {
- return this.passivationCount;
+ return this.passivationCount;
}
public void makeStateNonSerializable() {
- nonSerializableState = new Object();
+ nonSerializableState = new Object();
}
public void sleepForSeconds(int sec) {
- try {
- Thread.currentThread().sleep(sec * 1000);
- } catch (Exception ex) {
- }
+ try {
+ Thread.currentThread().sleep(sec * 1000);
+ } catch (Exception ex) {
+ }
}
public void unusedMethod() {
@@ -232,7 +232,7 @@
public void ejbRemove() {}
public void ejbActivate() {
- throw new EJBException("Container called ejbActivate?????");
+ throw new EJBException("Container called ejbActivate?????");
}
void postActivate() {
@@ -240,7 +240,7 @@
}
public void ejbPassivate() {
- throw new EJBException("Container called ejbPassivate?????");
+ throw new EJBException("Container called ejbPassivate?????");
}
@PrePassivate
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java
index 87715be..b2340b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java
@@ -21,5 +21,5 @@
public interface SFSBLocal
extends EJBLocalObject
{
- public String getName();
+ public String getName();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java
index b88dc2d..4150ba7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java
@@ -22,6 +22,6 @@
public interface SFSBLocalHome
extends EJBLocalHome
{
- public SFSBLocal create(String sfsbName)
+ public SFSBLocal create(String sfsbName)
throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/create_pointbase.sql
index 1ad6187..59bf79e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- keyid char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ keyid char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.properties b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.properties
index 2a6b8a4..9e961fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-sfsb-passivateactivate"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.xml
index 2f868ca..d3a6767 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java
index 8c22956..3b3f5c6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java
@@ -33,8 +33,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 40;
@@ -52,15 +52,15 @@
client.doTest();
System.out.println("[passivateactivateClient] DONE doTest()...");
stat.printSummary("passivateactivate");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
accessSFSB(); //access the SFBS
- removeTest();
+ removeTest();
}
private void initSFSBList() {
@@ -90,21 +90,21 @@
public void accessSFSB() {
try {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
boolean passed = true;
for (int i=0; i < MAX_SFSBS; i++) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
- String retrievedName = sfsb.getName();
-
+ String retrievedName = sfsb.getName();
+
boolean sessionCtxTest = sfsb.checkSessionContext();
boolean initialCtxTest = sfsb.checkInitialContext();
boolean entityHomeTest = sfsb.checkEntityHome();
@@ -114,32 +114,32 @@
boolean homeHandleTest = sfsb.checkHomeHandle();
boolean handleTest = sfsb.checkHandle();
boolean utTest = sfsb.checkUserTransaction();
- boolean activationTest = (sfsb.getActivationCount() != 0);
- boolean passivationTest = (sfsb.getPassivationCount() != 0);
+ boolean activationTest = (sfsb.getActivationCount() != 0);
+ boolean passivationTest = (sfsb.getPassivationCount() != 0);
- int actCount = sfsb.getActivationCount();
- int pasCount = sfsb.getPassivationCount();
+ int actCount = sfsb.getActivationCount();
+ int pasCount = sfsb.getPassivationCount();
System.out.println(sessionCtxTest + "; " + initialCtxTest
+ "; " + entityHomeTest + "; " + entityLocalHomeTest
+ "; " + entityRemoteTest + "; " + entityLocalTest
- + "; " + homeHandleTest + "; " + handleTest
+ + "; " + homeHandleTest + "; " + handleTest
+ "; " + utTest
- + "; " + activationTest + " (" + actCount + ")"
- + "; " + passivationTest + " (" + pasCount + ")"
- );
+ + "; " + activationTest + " (" + actCount + ")"
+ + "; " + passivationTest + " (" + pasCount + ")"
+ );
passed = sessionCtxTest && initialCtxTest
&& entityHomeTest && entityLocalHomeTest
&& entityRemoteTest && entityLocalTest
&& homeHandleTest && handleTest && utTest
- && activationTest && passivationTest;
+ && activationTest && passivationTest;
if (! passed) {
break;
}
- sfsb.sleepForSeconds(2);
+ sfsb.sleepForSeconds(2);
}
if (passed) {
@@ -153,44 +153,44 @@
String sfsbName = _sfsbPrefix+i;
sfsb.makeStateNonSerializable();
- }
+ }
- //Creating these many SFSBs should force passivation of the above
- // non-serializable beans
+ //Creating these many SFSBs should force passivation of the above
+ // non-serializable beans
for (int i=0; i < MAX_SFSBS; i++) {
- home.create(_sfsbPrefix + (i+1)*1000);
- }
+ home.create(_sfsbPrefix + (i+1)*1000);
+ }
- System.out.println("Waiting for 10 seconds for passivation to complete...");
+ System.out.println("Waiting for 10 seconds for passivation to complete...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
for (int i=0; i < MAX_SFSBS; i++) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
try {
- System.out.print("Expecting exception for: " + sfsbName);
- String nm = sfsb.getName();
- System.out.println("ERROR. Didn't get expected exception. "
- + "Got: " + nm);
- passed = false;
- break;
- } catch (Exception ex) {
- System.out.println("[**Got Exception**]");
- }
- }
- if (passed) {
- stat.addStatus("ejbclient non-serializable-state", stat.PASS);
- } else {
- stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
- }
+ System.out.print("Expecting exception for: " + sfsbName);
+ String nm = sfsb.getName();
+ System.out.println("ERROR. Didn't get expected exception. "
+ + "Got: " + nm);
+ passed = false;
+ break;
+ } catch (Exception ex) {
+ System.out.println("[**Got Exception**]");
+ }
+ }
+ if (passed) {
+ stat.addStatus("ejbclient non-serializable-state", stat.PASS);
+ } else {
+ stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
+ }
} catch (Exception ex) {
stat.addStatus("ejbclient accessSFSB", stat.FAIL);
@@ -199,33 +199,33 @@
public void removeTest() {
- SFSB sfsb = null;
- try {
- String myName = "_2_" + _sfsbPrefix + "_2_";
- sfsb = (SFSB) home.create(myName);
- String retrievedName = sfsb.getName();
- boolean nameOK = myName.equalsIgnoreCase(retrievedName);
- boolean gotException = false;
+ SFSB sfsb = null;
+ try {
+ String myName = "_2_" + _sfsbPrefix + "_2_";
+ sfsb = (SFSB) home.create(myName);
+ String retrievedName = sfsb.getName();
+ boolean nameOK = myName.equalsIgnoreCase(retrievedName);
+ boolean gotException = false;
// Test BMT SFSB remove called in a transaction
- jakarta.transaction.UserTransaction ut = (jakarta.transaction.UserTransaction)
+ jakarta.transaction.UserTransaction ut = (jakarta.transaction.UserTransaction)
(new InitialContext()).lookup("java:comp/UserTransaction");
ut.begin();
- sfsb.remove();
+ sfsb.remove();
ut.commit();
- try {
- sfsb.getName();
- gotException = false; //Expecting an exception
- } catch (Exception ex) {
- gotException = true;
- }
+ try {
+ sfsb.getName();
+ gotException = false; //Expecting an exception
+ } catch (Exception ex) {
+ gotException = true;
+ }
- String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
+ String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
if (nameOK && gotException) {
stat.addStatus("ejbclient removeTest " + resultStr, stat.PASS);
} else {
System.err.println("======> FAIL because: nameOK: " + nameOK + " gotException: " + gotException);
- stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
+ stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
}
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/descriptor/sun-ejb-jar.xml
index 31c971b..c29af31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/descriptor/sun-ejb-jar.xml
@@ -29,7 +29,7 @@
</ejb-ref>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
</ejb>
<ejb>
@@ -47,10 +47,10 @@
<res-ref-name>jdbc/DataSource</res-ref-name>
<jndi-name>jdbc/__default</jndi-name>
</resource-ref>
- <bean-pool>
- <steady-pool-size>4</steady-pool-size>
- <max-pool-size>17</max-pool-size>
- </bean-pool>
+ <bean-pool>
+ <steady-pool-size>4</steady-pool-size>
+ <max-pool-size>17</max-pool-size>
+ </bean-pool>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java
index 2b4a211..d602aca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java
@@ -24,37 +24,37 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
- public void createSFSBChild()
- throws RemoteException;
+ public void createSFSBChild()
+ throws RemoteException;
public String getMessage()
- throws RemoteException;
+ throws RemoteException;
public boolean checkSessionContext()
- throws RemoteException;
+ throws RemoteException;
public boolean checkInitialContext()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityHome()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityLocalHome()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityRemoteRef()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityLocalRef()
- throws RemoteException;
+ throws RemoteException;
public boolean checkHomeHandle()
- throws RemoteException;
+ throws RemoteException;
public boolean checkHandle()
- throws RemoteException;
+ throws RemoteException;
public boolean checkUserTransaction()
throws RemoteException;
@@ -63,17 +63,17 @@
throws RemoteException;
public int getActivationCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivationCount()
- throws RemoteException;
+ throws RemoteException;
public void makeStateNonSerializable()
- throws RemoteException;
+ throws RemoteException;
public void sleepForSeconds(int sec)
- throws RemoteException;
+ throws RemoteException;
public void unusedMethod()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java
index df1a46d..d87ed81 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -51,7 +51,7 @@
private SimpleEntityLocalHome entityLocalHome;
private SimpleEntityLocal entityLocal;
private SFSBHome sfsbHome;
- private SFSB sfsbRemote;
+ private SFSB sfsbRemote;
private SFSBLocalHome sfsbLocalHome;
private SFSBLocal sfsbLocal;
@@ -60,9 +60,9 @@
private UserTransaction userTransaction1;
private UserTransaction userTransaction2;
- private int activationCount;
- private int passivationCount;
- private Object nonSerializableState;
+ private int activationCount;
+ private int passivationCount;
+ private Object nonSerializableState;
public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
@@ -75,10 +75,10 @@
sfsbHome = (SFSBHome) sessionCtx.getEJBHome();
sfsbLocalHome = (SFSBLocalHome) sessionCtx.getEJBLocalHome();
-
+
homeHandle = entityHome.getHomeHandle();
handle = entityRemote.getHandle();
-
+
userTransaction1 = sessionCtx.getUserTransaction();
userTransaction2 = (UserTransaction) new InitialContext().
lookup("java:comp/UserTransaction");
@@ -98,15 +98,15 @@
sfsbRemote = sfsbHome.create(sfsbName + " _child");
sfsbLocal = sfsbLocalHome.create(sfsbName + LOCAL_CHILD_SUFFIX);
} catch(Exception e) {
- EJBException ex = new EJBException(e.getMessage());
- ex.initCause(e);
+ EJBException ex = new EJBException(e.getMessage());
+ ex.initCause(e);
throw ex;
}
}
public boolean checkSFSBChild() {
String childName = sfsbLocal.getName();
- boolean status = childName.equals(sfsbName + LOCAL_CHILD_SUFFIX);
+ boolean status = childName.equals(sfsbName + LOCAL_CHILD_SUFFIX);
return status;
}
@@ -203,7 +203,7 @@
public boolean checkUserTransaction() {
boolean status =
((userTransaction1 != null) && (userTransaction2 != null));
-
+
try {
if( status ) {
userTransaction1.begin();
@@ -235,7 +235,7 @@
}
if (ok) {
fieldName = "java:";
- ok = ( (javaCtx != null) &&
+ ok = ( (javaCtx != null) &&
javaCtx.getNameInNamespace().equals(fieldName) );
}
if (ok) {
@@ -247,7 +247,7 @@
fieldName = "java:comp/env";
ok = ( (envCtx != null) &&
envCtx.getNameInNamespace().equals(fieldName) );
-
+
}
if (ok) {
fieldName = "java:comp/env/ejb";
@@ -256,7 +256,7 @@
}
if (ok) {
fieldName = "env-entry";
-
+
String value1 = (String)
initialCtx.lookup("java:comp/env/TagValue");
String value2 = (String) envCtx.lookup("TagValue");
@@ -268,9 +268,9 @@
ex.printStackTrace();
ok = false;
}
-
+
this.message = (ok) ? null : (fieldName + " not restored properly");
-
+
return ok;
}
@@ -279,22 +279,22 @@
}
public int getActivationCount() {
- return this.activationCount;
+ return this.activationCount;
}
public int getPassivationCount() {
- return this.passivationCount;
+ return this.passivationCount;
}
public void makeStateNonSerializable() {
- nonSerializableState = new Object();
+ nonSerializableState = new Object();
}
public void sleepForSeconds(int sec) {
- try {
- Thread.currentThread().sleep(sec * 1000);
- } catch (Exception ex) {
- }
+ try {
+ Thread.currentThread().sleep(sec * 1000);
+ } catch (Exception ex) {
+ }
}
public void unusedMethod() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java
index 4c636b3..4ea2ead 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java
@@ -23,6 +23,6 @@
public interface SFSBHome
extends EJBHome
{
- public SFSB create(String sfsbName)
+ public SFSB create(String sfsbName)
throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java
index b54aca7..ac8a749 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java
@@ -21,5 +21,5 @@
public interface SFSBLocal
extends EJBLocalObject
{
- public String getName();
+ public String getName();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java
index c91cb9d..4afb68a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java
@@ -22,6 +22,6 @@
public interface SFSBLocalHome
extends EJBLocalHome
{
- public SFSBLocal create(String sfsbName)
+ public SFSBLocal create(String sfsbName)
throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java
index c9e4eca..70bd692 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java
@@ -56,8 +56,8 @@
Connection c = null;
PreparedStatement ps = null;
try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"INSERT INTO SimpleEntity (keyid, name) VALUES (?,?)");
ps.setString(1, key);
ps.setString(2, name);
@@ -68,7 +68,7 @@
this.name = name;
} catch (SQLException e) {
throw new CreateException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -94,10 +94,10 @@
throws FinderException
{
Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"SELECT keyid from SimpleEntity where keyid = ?");
ps.setString(1, key);
ResultSet rs = ps.executeQuery();
@@ -107,7 +107,7 @@
return key;
} catch (SQLException e) {
throw new FinderException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -125,65 +125,65 @@
ps = c.prepareStatement(
"SELECT name from SimpleEntity where keyid = ?");
ps.setString(1, key);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + key);
- this.name = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + key);
+ this.name = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE SimpleEntity SET name = ? WHERE keyid = ?");
- ps.setString(1, name);
- ps.setString(2, key);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE SimpleEntity SET name = ? WHERE keyid = ?");
+ ps.setString(1, name);
+ ps.setString(2, key);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM SimpleEntity WHERE keyid = ?");
- ps.setString(1, name);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM SimpleEntity WHERE keyid = ?");
+ ps.setString(1, name);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.properties b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.properties
index d708719..41387ac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-sfsb-lifecycle"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.xml
index 9a14c5a..746ba95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
index 6c1c63a..058bc78 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 24;
@@ -53,15 +53,15 @@
client.doTest();
System.out.println("[lfTraditional] DONE doTest()...");
stat.printSummary("passivateactivate");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
accessSFSB(); //access the SFBS
- removeTest();
+ removeTest();
}
private void initSFSBList() {
@@ -91,47 +91,47 @@
public void accessSFSB() {
try {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
boolean passed = true;
for (int i=0; i < MAX_SFSBS; i++) {
try {
- SFSB sfsb = (SFSB) sfsbList.get(i);
+ SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
- String retrievedName = sfsb.getName();
-
- boolean ok = sfsb.isOK(sfsbName);
- int actCount = sfsb.getActivationCount();
- int pasCount = sfsb.getPassivationCount();
+ String retrievedName = sfsb.getName();
- boolean activationTest = (actCount != 0);
- boolean passivationTest = (pasCount != 0);
+ boolean ok = sfsb.isOK(sfsbName);
+ int actCount = sfsb.getActivationCount();
+ int pasCount = sfsb.getPassivationCount();
+
+ boolean activationTest = (actCount != 0);
+ boolean passivationTest = (pasCount != 0);
System.out.println("Bean[" + i + "/" + MAX_SFSBS + "] name: " + sfsbName
- + "; retrievedName: " + retrievedName
- + "; ok: " + ok
- + "; " + activationTest + " (" + actCount + ")"
- + "; " + passivationTest + " (" + pasCount + ")"
- );
+ + "; retrievedName: " + retrievedName
+ + "; ok: " + ok
+ + "; " + activationTest + " (" + actCount + ")"
+ + "; " + passivationTest + " (" + pasCount + ")"
+ );
passed = passed & sfsbName.equals(retrievedName)
&& ok
- && activationTest && passivationTest;
+ && activationTest && passivationTest;
if (! passed) {
//break;
}
- sfsb.sleepForSeconds(1);
- } catch (Exception ex) {
- System.out.println("Bean[" + i + "] Got exception: " + ex);
- }
+ sfsb.sleepForSeconds(1);
+ } catch (Exception ex) {
+ System.out.println("Bean[" + i + "] Got exception: " + ex);
+ }
}
if (passed) {
@@ -145,44 +145,44 @@
String sfsbName = _sfsbPrefix+i;
sfsb.makeStateNonSerializable();
- }
+ }
- //Creating these many SFSBs should force passivation of the above
- // non-serializable beans
+ //Creating these many SFSBs should force passivation of the above
+ // non-serializable beans
for (int i=0; i < MAX_SFSBS; i++) {
- home.create(_sfsbPrefix + (i+1)*1000);
- }
+ home.create(_sfsbPrefix + (i+1)*1000);
+ }
- System.out.println("Waiting for 10 seconds for passivation to complete...");
+ System.out.println("Waiting for 10 seconds for passivation to complete...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
for (int i=0; i < MAX_SFSBS; i++) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
try {
- System.out.print("Expecting exception for: " + sfsbName);
- String nm = sfsb.getName();
- System.out.println("ERROR. Didn't get expected exception. "
- + "Got: " + nm);
- passed = false;
- break;
- } catch (Exception ex) {
- System.out.println("[**Got Exception**]");
- }
- }
- if (passed) {
- stat.addStatus("ejbclient non-serializable-state", stat.PASS);
- } else {
- stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
- }
+ System.out.print("Expecting exception for: " + sfsbName);
+ String nm = sfsb.getName();
+ System.out.println("ERROR. Didn't get expected exception. "
+ + "Got: " + nm);
+ passed = false;
+ break;
+ } catch (Exception ex) {
+ System.out.println("[**Got Exception**]");
+ }
+ }
+ if (passed) {
+ stat.addStatus("ejbclient non-serializable-state", stat.PASS);
+ } else {
+ stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
+ }
} catch (Exception ex) {
stat.addStatus("ejbclient accessSFSB", stat.FAIL);
@@ -191,29 +191,29 @@
public void removeTest() {
- SFSB sfsb = null;
- try {
- String myName = "_2_" + _sfsbPrefix + "_2_";
- sfsb = (SFSB) home.create(myName);
- String retrievedName = sfsb.getName();
- boolean nameOK = myName.equalsIgnoreCase(retrievedName);
- boolean gotException = false;
- sfsb.remove();
- Exception excep = null;
- try {
- sfsb.getName();
- gotException = false; //Expecting an exception
- } catch (Exception ex) {
- gotException = true;
- excep = ex;
- }
+ SFSB sfsb = null;
+ try {
+ String myName = "_2_" + _sfsbPrefix + "_2_";
+ sfsb = (SFSB) home.create(myName);
+ String retrievedName = sfsb.getName();
+ boolean nameOK = myName.equalsIgnoreCase(retrievedName);
+ boolean gotException = false;
+ sfsb.remove();
+ Exception excep = null;
+ try {
+ sfsb.getName();
+ gotException = false; //Expecting an exception
+ } catch (Exception ex) {
+ gotException = true;
+ excep = ex;
+ }
- String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
+ String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
if (nameOK && gotException) {
stat.addStatus("ejbclient removeTest " + resultStr, stat.PASS);
} else {
System.err.println("======> FAIL 2 because: nameOK: " + nameOK + " gotException: " + gotException);
- stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
+ stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
}
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/descriptor/sun-ejb-jar.xml
index 9ecf001..3f6e1a9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/descriptor/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<jndi-name>ejb/ejb_sfsb_lifecycle_SFSB</jndi-name>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java
index 9a11488..2bf9fff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java
@@ -24,23 +24,23 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public int getActivationCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivationCount()
- throws RemoteException;
+ throws RemoteException;
public void makeStateNonSerializable()
- throws RemoteException;
+ throws RemoteException;
public void sleepForSeconds(int sec)
- throws RemoteException;
+ throws RemoteException;
public boolean isOK(String name)
- throws RemoteException;
+ throws RemoteException;
public void unusedMethod()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java
index 838a5af..8e86033 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java
@@ -32,7 +32,7 @@
@CallbackListener("com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb.LifecycleListener")
@Stateful
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private Context envCtx;
@@ -48,7 +48,7 @@
private String sfsbName;
private String envEntryTagValue;
private SFSBHome sfsbHome;
- private SFSB sfsbRemote;
+ private SFSB sfsbRemote;
private SFSBLocalHome sfsbLocalHome;
private SFSBLocal sfsbLocal;
@@ -57,9 +57,9 @@
private UserTransaction userTransaction1;
private UserTransaction userTransaction2;
- private int activationCount;
- private int passivationCount;
- private Object nonSerializableState;
+ private int activationCount;
+ private int passivationCount;
+ private Object nonSerializableState;
public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
@@ -68,13 +68,13 @@
try {
sfsbHome = (SFSBHome) sessionCtx.getEJBHome();
sfsbLocalHome = (SFSBLocalHome) sessionCtx.getEJBLocalHome();
-
+
homeHandle = sfsbHome.getHomeHandle();
handle = sessionCtx.getEJBObject().getHandle();
-
+
userTransaction1 = sessionCtx.getUserTransaction();
userTransaction2 = (UserTransaction) new InitialContext().
- lookup("java:comp/UserTransaction");
+ lookup("java:comp/UserTransaction");
} catch (Exception ex) {
ex.printStackTrace();
//TODO
@@ -133,7 +133,7 @@
public boolean checkUserTransaction() {
boolean status =
((userTransaction1 != null) && (userTransaction2 != null));
-
+
try {
if( status ) {
userTransaction1.begin();
@@ -184,9 +184,9 @@
ex.printStackTrace();
ok = false;
}
-
+
this.message = (ok) ? null : (fieldName + " not restored properly");
-
+
return ok;
}
@@ -195,22 +195,22 @@
}
public int getActivationCount() {
- return this.activationCount;
+ return this.activationCount;
}
public int getPassivationCount() {
- return this.passivationCount;
+ return this.passivationCount;
}
public void makeStateNonSerializable() {
- nonSerializableState = new Object();
+ nonSerializableState = new Object();
}
public void sleepForSeconds(int sec) {
- try {
- Thread.currentThread().sleep(sec * 1000);
- } catch (Exception ex) {
- }
+ try {
+ Thread.currentThread().sleep(sec * 1000);
+ } catch (Exception ex) {
+ }
}
public void unusedMethod() {
@@ -232,7 +232,7 @@
public void ejbRemove() {}
public void ejbActivate() {
- throw new EJBException("Container called ejbActivate?????");
+ throw new EJBException("Container called ejbActivate?????");
}
void postActivate() {
@@ -240,7 +240,7 @@
}
public void ejbPassivate() {
- throw new EJBException("Container called ejbPassivate?????");
+ throw new EJBException("Container called ejbPassivate?????");
}
@PrePassivate
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java
index 87715be..b2340b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java
@@ -21,5 +21,5 @@
public interface SFSBLocal
extends EJBLocalObject
{
- public String getName();
+ public String getName();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java
index b88dc2d..4150ba7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java
@@ -22,6 +22,6 @@
public interface SFSBLocalHome
extends EJBLocalHome
{
- public SFSBLocal create(String sfsbName)
+ public SFSBLocal create(String sfsbName)
throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/create_pointbase.sql
index 1ad6187..59bf79e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- keyid char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ keyid char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.properties b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.properties
index 1208446..983a545 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-sfsb-stress"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="loadgenerator.client" value="com.sun.s1asdev.ejb.sfsb.stress.client.LoadGenerator"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml
index 84132d0..cede30f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*Load*.class **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="build,init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,13 +81,13 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="runloadgenerator">
<java fork="true" failonerror="true"
@@ -97,7 +97,7 @@
<arg value="ejb/ejb_sfsb_stress_StressSFSBHome"/>
<arg value="${ictx.props}"/>
</java>
- </target>
+ </target>
<target name="run_cosnaming" depends="init-common">
<antcall target="runloadgenerator">
@@ -108,7 +108,7 @@
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
index d61571b..e1fcf92 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 40;
@@ -50,13 +50,13 @@
client.doTest();
System.out.println("[stressClient] DONE doTest()...");
stat.printSummary("stress");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
accessSFSB(); //access the SFBS
}
@@ -92,7 +92,7 @@
for (int i=0; i < MAX_SFSBS; i++) {
StressSFSB sfsb = (StressSFSB) sfsbList.get(i);
String sfsbName = "SFSB_"+i;
-
+
passed = sfsb.doWork((long) 2000);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java
index 725d2c4..df25671 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java
@@ -28,27 +28,27 @@
public class LoadGenerator {
private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
- private static String propsFileName =
- "/export/home/s1as/cts/ws/appserv-tests/devtests/ejb/sfsb/stress/client/jndi.properties";
+ new SimpleReporterAdapter("appserv-tests");
+ private static String propsFileName =
+ "/export/home/s1as/cts/ws/appserv-tests/devtests/ejb/sfsb/stress/client/jndi.properties";
private Context ctx;
private StressSFSBHome home;
public LoadGenerator(String[] args)
- throws Exception
+ throws Exception
{
- String jndiName = args[0];
- ctx = getContext(args[1]);
+ String jndiName = args[0];
+ ctx = getContext(args[1]);
- Object ref = ctx.lookup(jndiName);
- this.home = (StressSFSBHome)
- PortableRemoteObject.narrow(ref, StressSFSBHome.class);
- System.out.println("LoadGenerator got home: " + home.getClass());
+ Object ref = ctx.lookup(jndiName);
+ this.home = (StressSFSBHome)
+ PortableRemoteObject.narrow(ref, StressSFSBHome.class);
+ System.out.println("LoadGenerator got home: " + home.getClass());
}
private InitialContext getContext(String propsFileName)
- throws Exception
+ throws Exception
{
InitialContext ic;
@@ -66,21 +66,21 @@
public void doTest() {
- for (int i=0; i<10; i++) {
- System.out.println("Creating StressSFSBClient[" + i + "]");
- String clientName = "client-"+i;
- StressSFSBClient client = new StressSFSBClient(clientName,
- home, 10);
- }
+ for (int i=0; i<10; i++) {
+ System.out.println("Creating StressSFSBClient[" + i + "]");
+ String clientName = "client-"+i;
+ StressSFSBClient client = new StressSFSBClient(clientName,
+ home, 10);
+ }
}
public static void main(String[] args) {
try {
- stat.addDescription("ejb-sfsb-stress");
- LoadGenerator generator = new LoadGenerator(args);
- generator.doTest();
- stat.addStatus("ejb-sfsb-stress main", stat.PASS);
+ stat.addDescription("ejb-sfsb-stress");
+ LoadGenerator generator = new LoadGenerator(args);
+ generator.doTest();
+ stat.addStatus("ejb-sfsb-stress main", stat.PASS);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("ejb-sfsb-stress main", stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java
index c635849..bbfa5d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java
@@ -33,41 +33,41 @@
implements Runnable
{
- String name;
+ String name;
StressSFSBHome home;
- ArrayList list;
- int maxActiveCount;
- boolean success = true;
- int maxIter = 5;
- Thread thread;
+ ArrayList list;
+ int maxActiveCount;
+ boolean success = true;
+ int maxIter = 5;
+ Thread thread;
public StressSFSBClient(String name,
- StressSFSBHome home, int maxActiveCount)
+ StressSFSBHome home, int maxActiveCount)
{
- thread = new Thread(this, name);
- this.name = name;
- this.home = home;
- this.maxActiveCount = maxActiveCount;
- this.list = new ArrayList(maxActiveCount);
- thread.start();
+ thread = new Thread(this, name);
+ this.name = name;
+ this.home = home;
+ this.maxActiveCount = maxActiveCount;
+ this.list = new ArrayList(maxActiveCount);
+ thread.start();
}
public void run() {
- System.out.println("StressSFSBClient: " + name + " started....");
- try {
- for (int i=0; i<maxActiveCount; i++) {
- list.add(home.create(name+"-"+i));
- }
- for (int count = 0; count < maxIter; count++) {
- for (int i=0; i<maxActiveCount; i++) {
- StressSFSB sfsb = (StressSFSB) list.get(i);
- sfsb.ping();
- }
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- success = false;
- }
+ System.out.println("StressSFSBClient: " + name + " started....");
+ try {
+ for (int i=0; i<maxActiveCount; i++) {
+ list.add(home.create(name+"-"+i));
+ }
+ for (int count = 0; count < maxIter; count++) {
+ for (int i=0; i<maxActiveCount; i++) {
+ StressSFSB sfsb = (StressSFSB) list.get(i);
+ sfsb.ping();
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ success = false;
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java
index fa62bbf..d2dca4c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java
@@ -24,7 +24,7 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public boolean hasSameName(String name)
throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java
index 63d8721..4679e33 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class StressSFSBBean
- implements SessionBean
+ implements SessionBean
{
private SessionContext sessionCtx;
private Context initialCtx;
@@ -52,7 +52,7 @@
}
public boolean doWork(long millis) {
- return true;
+ return true;
}
public void setSessionContext(SessionContext sc) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java
index 758c2aa..1ff92cd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java
@@ -24,5 +24,5 @@
extends EJBHome
{
public StressSFSB create(String sfsbName)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/create_pointbase.sql
index 8504c3e..58342d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table StressEntity;
-
-CREATE TABLE StressEntity (
- key char(20) not null,
- name char(20)
-);
-
+Drop table StressEntity;
+
+CREATE TABLE StressEntity (
+ key char(20) not null,
+ name char(20)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/drop_pointbase.sql
index ea05487..2a1817a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table StressEntity;
+Drop table StressEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stress/build.xml
index 4d4752d..2e051bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/build.xml
@@ -37,11 +37,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-sfsb tests)
- ant passivateactivate (Executes the ejb-sfsb-passivateactivate test)
- ant sfsbcache (Executes the ejb-sfsb-sfsbcache test)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-sfsb tests)
+ ant passivateactivate (Executes the ejb-sfsb-passivateactivate test)
+ ant sfsbcache (Executes the ejb-sfsb-sfsbcache test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.properties
index 60ceea1..38df6ff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stress-passivateactivate"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.xml
index aaeea60..105470f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,14 +48,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -67,7 +67,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -79,14 +79,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
index 2ce8a0b..4b4218d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 600;
@@ -50,13 +50,13 @@
client.doTest();
System.out.println("[passivateactivateClient] DONE doTest()...");
stat.printSummary("passivateactivate");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
accessSFSB(); //access the SFBS
}
@@ -92,7 +92,7 @@
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = sfsb.getName();
System.out.println("Successfully accessed SFSB bean for: " + sfsbName);
-
+
stat.addStatus("ejbclient accessSFSB", stat.PASS);
}
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java
index 35fbf08..049be86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java
@@ -23,7 +23,7 @@
extends EJBObject
{
- public String getName()
+ public String getName()
throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java
index 8b2ec1d..c99eebe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java
@@ -26,13 +26,13 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
- private SessionContext context;
+ private SessionContext context;
private String sfsbName;
private Context initialCtx;
- public void ejbCreate(String sfsbName) {
+ public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
this.sfsbName = sfsbName;
}
@@ -41,22 +41,22 @@
return this.sfsbName;
}
- public void setSessionContext(SessionContext sc) {
- this.context = sc;
+ public void setSessionContext(SessionContext sc) {
+ this.context = sc;
try {
this.initialCtx = new InitialContext();
} catch (Throwable th) {
th.printStackTrace();
}
- }
+ }
- public void ejbRemove() {}
+ public void ejbRemove() {}
- public void ejbActivate() {
+ public void ejbActivate() {
System.out.println ("In SFSB.ejbActivate() for name -> " + sfsbName);
}
- public void ejbPassivate() {
+ public void ejbPassivate() {
System.out.println ("In SFSB.ejbPassivate() for name -> " + sfsbName);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java
index 7ebf5c3..3acf770 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java
@@ -23,6 +23,6 @@
public interface SFSBHome
extends EJBHome
{
- public SFSB create(String sfsbName)
+ public SFSB create(String sfsbName)
throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.properties
index 9887510..f39d9e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stress-sfsbcache"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.xml
index 784023b..6644477 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,14 +48,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -67,7 +67,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -79,14 +79,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
index af3c018..e1454aa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 600;
@@ -50,13 +50,13 @@
client.doTest();
System.out.println("[sfsbcacheClient] DONE doTest()...");
stat.printSummary("sfsbcache");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
-
+
System.out.println("[sfsbcacheClient] Inside init....");
try {
Context ic = new InitialContext();
@@ -66,7 +66,7 @@
//Creating these many SFSBs will cause passivation
SFSB sfsb = (SFSB) home.create("SFSB_");
-
+
sfsb.getName();
sfsb.remove();
@@ -97,6 +97,6 @@
e.printStackTrace();
stat.addStatus("ejbclient accessSFSB", stat.FAIL);
}
- }
+ }
} //Client{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java
index 0ba4040..0a3f833 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java
@@ -23,7 +23,7 @@
extends EJBObject
{
- public String getName()
+ public String getName()
throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java
index f0f1e14..671ba68 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java
@@ -26,13 +26,13 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
- private SessionContext context;
+ private SessionContext context;
private String sfsbName;
private Context initialCtx;
- public void ejbCreate(String sfsbName) {
+ public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
this.sfsbName = sfsbName;
}
@@ -41,22 +41,22 @@
return this.sfsbName;
}
- public void setSessionContext(SessionContext sc) {
- this.context = sc;
+ public void setSessionContext(SessionContext sc) {
+ this.context = sc;
try {
this.initialCtx = new InitialContext();
} catch (Throwable th) {
th.printStackTrace();
}
- }
+ }
- public void ejbRemove() {}
+ public void ejbRemove() {}
- public void ejbActivate() {
+ public void ejbActivate() {
System.out.println ("In SFSB.ejbActivate() for name -> " + sfsbName);
}
- public void ejbPassivate() {
+ public void ejbPassivate() {
System.out.println ("In SFSB.ejbPassivate() for name -> " + sfsbName);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java
index 6ba094a..c459352 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java
@@ -23,6 +23,6 @@
public interface SFSBHome
extends EJBHome
{
- public SFSB create(String sfsbName)
+ public SFSB create(String sfsbName)
throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.properties
index 47e18db..6f21527 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-appclient"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.xml
index aa6a5cb..f863913 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="client"/>
@@ -43,13 +43,13 @@
<target name="build" depends="compile">
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Hello.class,**/*HelloHome.class" />
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -57,10 +57,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java
index 0eebc28..0a12045 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,31 +37,31 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-stubs-appclientID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
@@ -73,8 +73,8 @@
e.printStackTrace();
stat.addStatus("appclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/build.xml
index d03c17f..a849501 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/build.xml
@@ -33,7 +33,7 @@
<antcall target="stubser"/>
<antcall target="ejbapp"/>
- <!-- standaloneclient must be executed right after ejbapp
+ <!-- standaloneclient must be executed right after ejbapp
to be able to use the generated stubs from the app client
-->
<antcall target="standaloneclient"/>
@@ -92,14 +92,14 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant ejbapp (Executes the ejb-stubs ejbapp test)
- ant ejbclient (Executes the ejb-stubs ejbclient test)
- ant appclient (Executes the ejb-stubs appclient test)
- ant webclient (Executes the ejb-stubs webclient test)
+ <echo>
+ Usage:
+ ant ejbapp (Executes the ejb-stubs ejbapp test)
+ ant ejbclient (Executes the ejb-stubs ejbclient test)
+ ant appclient (Executes the ejb-stubs appclient test)
+ ant webclient (Executes the ejb-stubs webclient test)
ant proxy (Executes the ejb-stubs proxy test)
- ant all (Executes all the ejb-stubs tests)
- </echo>
+ ant all (Executes all the ejb-stubs tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.properties
index 5d90da6..55f400e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-ejbapp"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.xml
index 091fc8a..67fa9b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -54,26 +54,26 @@
<param name="ejbjar.classes" value="**/Hello*.class,**/Dummy*.class"/>
<param name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<param name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
+ <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
</antcall>
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}"/>
<param name="ejbjar.classes" value="**/Foo*.class,**/Hello.class,**/HelloHome.class"/>
<param name="ejb-jar.xml" value="descriptor/ejb-jar.xml.ejbclient"/>
<param name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml.ejbclient"/>
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb-ejbclient.jar"/>
+ <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb-ejbclient.jar"/>
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo.class,**/*FooHome.class,**/*Hello.class,**/*HelloHome.class" />
</antcall>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="true"/>
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common">
<param name="as.props" value="${as.props} --generatermistubs=true"/>
@@ -85,10 +85,10 @@
<param name="appclient.application.args" value="${http.host} ${http.port}"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java
index a9e97c4..ea6507a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java
@@ -32,7 +32,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -41,38 +41,38 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-stubs-ejbappID");
- }
+ }
private String host;
private String port;
-
+
public Client (String[] args) {
host = ( args.length > 0) ? args[0] : "localhost";
port = ( args.length > 1) ? args[1] : "4848";
}
-
+
public void doTest() {
Context ic = null;
try {
ic = new InitialContext();
-
+
System.out.println("Looking up ejbapp ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
@@ -86,20 +86,20 @@
try {
System.out.println("Looking up ejbclient ejbref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello_ejbclient");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome fooHome = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Foo foo = fooHome.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
foo.callHello();
@@ -113,11 +113,11 @@
}
try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/ejb-stubs-ejbapp/servlet";
System.out.println("invoking webclient servlet at " + url);
int code = invokeServlet(url);
-
+
if(code != 200) {
System.out.println("Incorrect return code: " + code);
stat.addStatus("ejbapp webclient", stat.FAIL);
@@ -129,14 +129,14 @@
stat.addStatus("ejbapp webclient", stat.FAIL);
ex.printStackTrace();
}
-
- return;
+
+ return;
}
private int invokeServlet(String url) throws Exception {
-
+
URL u = new URL(url);
-
+
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
index 7d38921..287b34e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.stubs.ejbapp;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -34,11 +34,11 @@
public DummyMEJBBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In DummyMEJBBean::ejbCreate !!");
+ System.out.println("In DummyMEJBBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public Set queryNames(ObjectName name, QueryExp query) {
@@ -51,34 +51,34 @@
public Integer getMBeanCount() {
- // Invoking this method from another app will verify that
+ // Invoking this method from another app will verify that
// the context class loader for this app is set appropriately during
// the invocation. The javax.management.j2ee apis are packaged
// as part of the server's classpath. That matches the behavior of
// Bug 6342495, which showed that the context class loader was still
// set to the calling application when the Home/Remote interfaces were
- // loaded from above the application classloader level.
+ // loaded from above the application classloader level.
//
// Calling getClassLoader tests that the context classloader is set
// appropriately because of the security requirements that J2SE
// imposes on requesting a class loader. By default application code
- // in the appserver does not have the RuntimePermission
+ // in the appserver does not have the RuntimePermission
// "getClassLoader". In that case, requesting a class loader is only
- // allowed if the returned class loader matches the requesting
- // class' class loader(or is a child of it). So, if the context
- // class loader is still incorrectly set to the calling app's
+ // allowed if the returned class loader matches the requesting
+ // class' class loader(or is a child of it). So, if the context
+ // class loader is still incorrectly set to the calling app's
// class loader, the call to getContextClassLoader() should throw
- // a security exception.
+ // a security exception.
// The advantage to writing the test using
// javax.management APIs and this behavior is it will work on an
// out-of-the-box installation of the appserver. No additions to the
// server's classpath or the default server.policy file are needed.
-
+
System.out.println("In DummyEJBBean::getMBeanCount()");
- System.out.println("My classloader = " +
+ System.out.println("My classloader = " +
DummyMEJBBean.class.getClassLoader());
// This should fail with a security exception if the caller is in
@@ -86,7 +86,7 @@
// loader is still incorrectly set to the caller app's classloader.
System.out.println("context class loader = " +
Thread.currentThread().getContextClassLoader());
-
+
return new Integer(0);
}
@@ -130,4 +130,4 @@
public void ejbPassivate() {}
}
- */
+ */
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java
index 1581ec6..982283d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -34,13 +34,13 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void callHello() {
@@ -48,21 +48,21 @@
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java
index 38f037d..d0a0c4e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -31,11 +31,11 @@
public HelloBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In HelloBean::ejbCreate !!");
+ System.out.println("In HelloBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void sayHello() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Servlet.java
index 831886f..bc1bc74 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Servlet.java
@@ -26,37 +26,37 @@
import com.sun.s1asdev.ejb.stubs.ejbapp.HelloHome;
public class Servlet extends HttpServlet {
-
+
public void init( ServletConfig config) throws ServletException {
-
+
super.init(config);
System.out.println("In ejbapp::servlet... init()");
}
-
+
public void service ( HttpServletRequest req , HttpServletResponse resp ) throws ServletException, IOException {
-
+
resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
-
+
try {
InitialContext ic = new InitialContext();
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
@@ -65,22 +65,22 @@
out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
-
+
}catch (Exception ex) {
ex.printStackTrace();
System.out.println("webclient servlet test failed");
throw new ServletException(ex);
- }
+ }
}
-
-
+
+
public void destroy() {
System.out.println("in webclient::servlet destroy");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.properties
index b73ff20..fb8cc8c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-ejbclient"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.xml
index e20dcd7..e1d3e23 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,30 +46,30 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/hello_library.jar"
- basedir="${build.classes.dir}"
+ <jar destfile="${assemble.dir}/hello_library.jar"
+ basedir="${build.classes.dir}"
includes ="**/Hello*.class">
- </jar>
+ </jar>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo.class,**/*FooHome.class" />
</antcall>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- update="true" basedir="${build.classes.dir}"
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ update="true" basedir="${build.classes.dir}"
includes ="**/Foo*.class">
<metainf dir="./descriptor">
<include name="ejb-jar.xml"/>
<include name="sun-ejb-jar.xml"/>
</metainf>
<manifest>
- <attribute name="Class-Path"
+ <attribute name="Class-Path"
value="hello_library.jar"/>
</manifest>
- </jar>
+ </jar>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -77,10 +77,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java
index 722a053..ba6fb63 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,31 +37,31 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-stubs-ejbclientID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/foo");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Foo f = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
f.callHello();
@@ -73,8 +73,8 @@
e.printStackTrace();
stat.addStatus("ejbclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java
index c627064..11c3214 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -34,11 +34,11 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void callHello() {
@@ -46,21 +46,21 @@
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.properties
index c29579e..b45bb89 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-proxy"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.xml
index 37f8ea8..2e72ab9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/HelloHome.class,**/Hello.class,**/*Client*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java
index b6fd438..ac5c21f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java
@@ -27,7 +27,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -36,34 +36,34 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-stubs-proxyID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
- Context ic = new InitialContext();
+ Context ic = new InitialContext();
- // create EJB using factory from container
- java.lang.Object objref =
+ // create EJB using factory from container
+ java.lang.Object objref =
ic.lookup("java:comp/env/ejb/ProxyApp");
- System.out.println("Looked up home!!");
+ System.out.println("Looked up home!!");
- HelloHome home = (HelloHome)
+ HelloHome home = (HelloHome)
PortableRemoteObject.narrow(objref, HelloHome.class);
- System.out.println("Narrowed home!!");
+ System.out.println("Narrowed home!!");
- Hello hr = home.create();
- System.out.println("Got the EJB!!");
+ Hello hr = home.create();
+ System.out.println("Got the EJB!!");
hr.testPassByRef();
- // invoke method on the EJB
- doProxyTest(hr);
+ // invoke method on the EJB
+ doProxyTest(hr);
testExceptions(hr);
@@ -75,8 +75,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
private void testExceptions(Hello h) throws Exception {
@@ -85,7 +85,7 @@
h.throwException();
} catch(Exception e) {
if( e.getClass() == Exception.class ) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
} else {
throw e;
@@ -96,7 +96,7 @@
h.throwAppException1();
throw new Exception("didn't get exception for testException2");
} catch(jakarta.ejb.FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -104,7 +104,7 @@
h.throwAppException2();
throw new Exception("didn't get exception for testException3");
} catch(jakarta.ejb.FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -130,36 +130,36 @@
}
}
- private void doProxyTest(Hello hr)
- throws Exception
+ private void doProxyTest(Hello hr)
+ throws Exception
{
- System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
- hr.warmup(Common.STATEFUL);
- runTests(Common.STATEFUL, hr);
+ System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
+ hr.warmup(Common.STATEFUL);
+ runTests(Common.STATEFUL, hr);
- System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
- hr.warmup(Common.STATEFUL);
- runTests(Common.STATELESS, hr);
+ System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
+ hr.warmup(Common.STATEFUL);
+ runTests(Common.STATELESS, hr);
- System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
- hr.warmup(Common.BMP);
- runTests(Common.BMP, hr);
+ System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
+ hr.warmup(Common.BMP);
+ runTests(Common.BMP, hr);
}
private void runTests(int type, Hello hr)
- throws Exception
+ throws Exception
{
-
+
hr.notSupported(type, true);
hr.notSupported(type, false);
hr.supports(type, true);
- hr.supports(type, false);
+ hr.supports(type, false);
hr.required(type, true);
- hr.required(type, false);
+ hr.required(type, false);
hr.requiresNew(type, true);
- hr.requiresNew(type, false);
+ hr.requiresNew(type, false);
hr.mandatory(type, true);
- hr.never(type, false);
+ hr.never(type, false);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/descriptor/ejb-jar.xml
index 9b84e13..6389966 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/descriptor/ejb-jar.xml
@@ -101,7 +101,7 @@
</session>
<session>
<ejb-name>SfulBean</ejb-name>
- <home>com.sun.s1asdev.ejb.stubs.proxy.SfulRemoteHome</home>
+ <home>com.sun.s1asdev.ejb.stubs.proxy.SfulRemoteHome</home>
<remote>com.sun.s1asdev.ejb.stubs.proxy.SfulRemote</remote>
<local-home>com.sun.s1asdev.ejb.stubs.proxy.SfulHome</local-home>
<local>com.sun.s1asdev.ejb.stubs.proxy.Sful</local>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java
index ed480b5..04ce5d3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java
@@ -25,7 +25,7 @@
public BmpEJB(){}
public String ejbCreate(String s) {
- return s;
+ return s;
}
public void ejbPostCreate(String s) {}
@@ -45,10 +45,10 @@
public void unsetEntityContext()
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -61,7 +61,7 @@
{}
public String ejbFindByPrimaryKey(String s) {
- return s;
+ return s;
}
public void testException1() throws Exception {
@@ -99,7 +99,7 @@
}
public void testPassByRef4(CommonRemote cr) {
-
+
}
public Helper1 testPassByRef5() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java
index 3e4cb7d..afc952f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java
@@ -22,5 +22,5 @@
public interface BmpHome extends EJBLocalHome
{
Bmp create(String s) throws CreateException;
- Bmp findByPrimaryKey(String s) throws CreateException;
+ Bmp findByPrimaryKey(String s) throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java
index c3f29fc..7d94391 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java
@@ -22,5 +22,5 @@
public interface BmpRemoteHome extends EJBHome
{
BmpRemote create(String s) throws RemoteException, CreateException;
- BmpRemote findByPrimaryKey(String s) throws RemoteException, CreateException;
+ BmpRemote findByPrimaryKey(String s) throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java
index 4896ffa..197dae4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java
@@ -42,7 +42,7 @@
private BmpRemoteHome bmpRemoteHome;
private long overhead;
-
+
private static final String pkey = "A BMP Bean";
jakarta.transaction.UserTransaction ut;
@@ -51,7 +51,7 @@
public void ejbCreate() {
- try {
+ try {
Context ic = new InitialContext();
Context ic1 = (Context) ic.lookup("java:comp/env");
@@ -60,27 +60,27 @@
Context ic2 = (Context) ic.lookup("java:comp/env/ejb");
String ic2Name = ic2.getNameInNamespace();
- Context ic2_ = (Context) ic.lookup(ic2Name);
+ Context ic2_ = (Context) ic.lookup(ic2Name);
- sfulHome = (SfulHome) ic2_.lookup("Sful");
+ sfulHome = (SfulHome) ic2_.lookup("Sful");
sful = sfulHome.create();
Object obj = ic2_.lookup("SfulRemote");
sfulRemoteHome = (SfulRemoteHome)
PortableRemoteObject.narrow(obj, SfulRemoteHome.class);
sfulRemote = sfulRemoteHome.create();
- System.out.println("Created Stateful bean.");
-
- slessHome = (SlessHome) ic1_.lookup("ejb/Sless");
+ System.out.println("Created Stateful bean.");
+
+ slessHome = (SlessHome) ic1_.lookup("ejb/Sless");
sless = slessHome.create();
obj = ic2_.lookup("SlessRemote");
slessRemoteHome = (SlessRemoteHome)
PortableRemoteObject.narrow(obj, SlessRemoteHome.class);
slessRemote = slessRemoteHome.create();
- System.out.println("Created Stateless bean.");
+ System.out.println("Created Stateless bean.");
- bmpHome = (BmpHome) ic.lookup("java:comp/env/ejb/Bmp");
+ bmpHome = (BmpHome) ic.lookup("java:comp/env/ejb/Bmp");
bmp = bmpHome.create(pkey);
obj = ic2_.lookup("BmpRemote");
@@ -89,14 +89,14 @@
bmpRemote = (BmpRemote)
bmpRemoteHome.findByPrimaryKey(pkey);
- System.out.println("Created BMP bean.");
-
- ut = context.getUserTransaction();
+ System.out.println("Created BMP bean.");
- } catch (Exception ex) {
- System.out.println("couldn't get all beans");
- ex.printStackTrace();
- }
+ ut = context.getUserTransaction();
+
+ } catch (Exception ex) {
+ System.out.println("couldn't get all beans");
+ ex.printStackTrace();
+ }
}
private void testRemove() throws RemoteException {
@@ -105,7 +105,7 @@
System.out.println("Created BMP bean.");
bmpHome.remove(bmp2.getPrimaryKey());
System.out.println("Successfully removed local entity bean");
- } catch(Exception e) {
+ } catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
@@ -130,7 +130,7 @@
// success
}
-
+
try {
EJBObject bmpRemote2 = bmpRemoteHome.create("foobar2");
System.out.println("Created BMP bean.");
@@ -174,9 +174,9 @@
try {
sful.remove();
-
+
try {
- sful.remove();
+ sful.remove();
throw new EJBException("2nd sful remove should have caused exception");
} catch(Exception e) {
System.out.println("Successfully caught exception when attempting to "+
@@ -186,7 +186,7 @@
sless.remove();
- bmp.remove();
+ bmp.remove();
} catch(Exception e) {
e.printStackTrace();
@@ -208,29 +208,29 @@
public void throwAppException2() throws FinderException {
throw new ObjectNotFoundException("throwAppException2");
}
-
- public void warmup(int type) throws Exception {
- warmup(type, true);
- warmup(type, false);
- // Measure looping and timing overhead
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- }
- long end = System.currentTimeMillis();
- overhead = end - begin;
+ public void warmup(int type) throws Exception {
+ warmup(type, true);
+ warmup(type, false);
+
+ // Measure looping and timing overhead
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ }
+ long end = System.currentTimeMillis();
+ overhead = end - begin;
String pkey2 = (String) bmp.getPrimaryKey();
if( !pkey2.equals(pkey) ) {
throw new EJBException("pkey2 " + pkey2 + " doesn't match " + pkey);
}
-
+
ut = context.getUserTransaction();
-
+
testLocalObjects(sful, sless);
testLocalObjects(sful, bmp);
testLocalObjects(sless, bmp);
-
+
testEJBObjects(sfulRemote, slessRemote);
testEJBObjects(sfulRemote, bmpRemote);
testEJBObjects(slessRemote, bmpRemote);
@@ -259,14 +259,14 @@
testExceptions(slessRemote);
testExceptions(bmpRemote);
}
-
+
private void testExceptions(Common c) {
try {
c.testException1();
throw new EJBException("didn't get exception for testException1");
} catch(Exception e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -274,7 +274,7 @@
c.testException2();
throw new EJBException("didn't get exception for testException2");
} catch(EJBException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -282,10 +282,10 @@
c.testException3();
throw new EJBException("didn't get exception for testException3");
} catch(FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
-
+
}
private void testExceptions(CommonRemote c) throws RemoteException {
@@ -294,7 +294,7 @@
c.testException1();
throw new EJBException("didn't get exception for testException1");
} catch(Exception e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -302,7 +302,7 @@
c.testException2();
throw new EJBException("didn't get exception for testException2");
} catch(RemoteException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -310,7 +310,7 @@
c.testException3();
throw new EJBException("didn't get exception for testException3");
} catch(FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -318,10 +318,10 @@
c.testException4();
throw new EJBException("didn't get exception for testException4");
} catch(FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
-
+
}
public Object testPassByRef() throws Exception {
@@ -343,9 +343,9 @@
return null;
}
- private void _testPassByRef(CommonRemote c, boolean passByRef)
+ private void _testPassByRef(CommonRemote c, boolean passByRef)
throws Exception {
-
+
int intVal = 1;
String stringVal = "HelloEJB::_testPassByRef";
@@ -361,7 +361,7 @@
if( passByRef ) {
if( (h1.a == intVal) || h1.b.equals(stringVal) ) {
throw new EJBException("h1 mutations not present " + h1);
- }
+ }
} else {
if( (h1.a != intVal) || !h1.b.equals(stringVal) ) {
throw new EJBException("error : h1 was mutated " + h1);
@@ -378,23 +378,23 @@
System.out.println("After testPassByRef3 : " + h2);
if( (h2.a == intVal) || h2.b.equals(stringVal) ) {
throw new EJBException("h2 mutations not present " + h2);
- }
+ }
} else {
try {
c.testPassByRef3(h2);
- System.out.println("Error : Expected exception when " +
+ System.out.println("Error : Expected exception when " +
"passing non-serializable data " + h2);
-
+
/* DON'T TREAT AS FATAL ERROR WHILE WE INVESTIGATE WHETHER
* THIS WAS INTENDED BEHAVIOR FOR THE ORB
- throw new EJBException("Error : Expected exception when " +
- "passing non-serializable data " +
+ throw new EJBException("Error : Expected exception when " +
+ "passing non-serializable data " +
h2);
*/
} catch(EJBException ejbex) {
throw ejbex;
} catch(Exception e) {
- System.out.println("Caught expected exception when " +
+ System.out.println("Caught expected exception when " +
" passing non-serializable data" +
e.toString());
}
@@ -409,16 +409,16 @@
} else {
try {
Helper2 h6 = c.testPassByRef6();
- System.out.println("Error : Expected exception when " +
+ System.out.println("Error : Expected exception when " +
"returning non-serializable data " + h6);
- /* see comment for testPassByRef3 above
- throw new EJBException("Error : Expected exception when " +
+ /* see comment for testPassByRef3 above
+ throw new EJBException("Error : Expected exception when " +
"returning non-serializable data ");
*/
} catch(EJBException ejbex) {
- throw ejbex;
+ throw ejbex;
} catch(Exception e) {
- System.out.println("Caught expected exception when " +
+ System.out.println("Caught expected exception when " +
" returning non-serializable data" +
e.toString());
}
@@ -450,144 +450,144 @@
}
private void warmup(int type, boolean tx) throws Exception {
- // get Hotspot warmed up
- Common bean = pre(type, tx);
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- bean.notSupported();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- if ( tx )
- bean.mandatory();
- else
- bean.never();
- bean.supports();
- }
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
+ // get Hotspot warmed up
+ Common bean = pre(type, tx);
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ bean.notSupported();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ if ( tx )
+ bean.mandatory();
+ else
+ bean.never();
+ bean.supports();
+ }
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
}
- private Common pre(int type, boolean tx)
+ private Common pre(int type, boolean tx)
{
- if ( tx ) try { ut.begin(); } catch ( Exception ex ) {}
- if ( type == Common.STATELESS )
- return sless;
- else if ( type == Common.STATEFUL )
- return sful;
- else
- return bmp;
+ if ( tx ) try { ut.begin(); } catch ( Exception ex ) {}
+ if ( type == Common.STATELESS )
+ return sless;
+ else if ( type == Common.STATEFUL )
+ return sful;
+ else
+ return bmp;
}
- private CommonRemote preRemote(int type, boolean tx)
- {
- if ( type == Common.STATELESS )
- return slessRemote;
- else if ( type == Common.STATEFUL )
- return sfulRemote;
- else
- return bmpRemote;
+ private CommonRemote preRemote(int type, boolean tx)
+ {
+ if ( type == Common.STATELESS )
+ return slessRemote;
+ else if ( type == Common.STATEFUL )
+ return sfulRemote;
+ else
+ return bmpRemote;
}
private float post(long begin, long end, boolean tx)
{
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
- return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
+ return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
}
public float requiresNew(int type, boolean tx) throws RemoteException
{
- Common bean = pre(type, tx);
+ Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- }
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ }
for ( int i=0; i<ITERATIONS; i++ ) {
- beanRemote.requiresNew();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ beanRemote.requiresNew();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float notSupported(int type, boolean tx) throws RemoteException
{
- Common bean = pre(type, tx);
+ Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.notSupported();
- }
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.notSupported();
+ }
for ( int i=0; i<ITERATIONS; i++ ) {
- beanRemote.notSupported();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ beanRemote.notSupported();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float required(int type, boolean tx) throws RemoteException
{
- Common bean = pre(type, tx);
+ Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- beanRemote.required();
- }
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ beanRemote.required();
+ }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float mandatory(int type, boolean tx) throws RemoteException
{
- Common bean = pre(type, tx);
+ Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.mandatory();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- beanRemote.mandatory();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.mandatory();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ beanRemote.mandatory();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float never(int type, boolean tx) throws RemoteException
{
- Common bean = pre(type, tx);
+ Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.never();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- beanRemote.never();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.never();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ beanRemote.never();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float supports(int type, boolean tx) throws RemoteException
{
- Common bean = pre(type, tx);
+ Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.supports();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- beanRemote.supports();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.supports();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ beanRemote.supports();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public void setSessionContext(SessionContext sc) {
- context = sc;
+ context = sc;
}
public void ejbRemove() {}
@@ -637,11 +637,11 @@
if( o1.isIdentical(o2) ) {
throw new EJBException("isIdentical failed");
}
-
+
if( o2.isIdentical(o1) ) {
throw new EJBException("isIdentical failed");
}
-
+
if( !o1.isIdentical(o1) ) {
throw new EJBException("isIdentical failed");
}
@@ -694,12 +694,12 @@
}
System.out.println("o1.hashCode() = " + o1.hashCode());
-
+
System.out.println("o2.hashCode() = " + o2.hashCode());
-
+
System.out.println("o1.toString() = " + o1.toString());
System.out.println("o2.toString() = " + o2.toString());
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java
index e416915..21d9852 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java
@@ -39,14 +39,14 @@
sc_ = sc;
}
- public void ejbRemove()
- {
+ public void ejbRemove()
+ {
System.out.println("In SfulEJB.ejbRemove(). about to throw exception");
throw new RuntimeException("test cleanup for case where " +
"ejbRemove throws an exception");
}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -102,7 +102,7 @@
Helper2 h2 = new Helper2();
h2.a = 1;
h2.b = "SfulEJB::testPassByRef6";
- return h2;
+ return h2;
}
public CommonRemote testPassByRef7() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java
index 9be053e..ae6e0cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java
@@ -40,10 +40,10 @@
sc_ = sc;
}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -70,7 +70,7 @@
}
public void testPassByRef1(int a) {
-
+
}
public void testPassByRef2(Helper1 helper1) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.properties
index a802333..d68eb1d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="test.name" value="com.sun.s1asdev.ejb.stubs.standaloneclient"/>
<property name="simple.client" value="${test.name}.SimpleClient"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml
index 4f9f151..b13140d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="init-common">
<mkdir dir="${build.classes.dir}"/>
<echo message="common.xml: Compiling test source files" level="verbose"/>
@@ -42,11 +42,11 @@
destdir="${build.classes.dir}"
classpath="${s1astest.classpath}:${build.classes.dir}"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
-
+
<target name="runclient_nooverride" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient/ejb-stubs-ejbapp-clientClient.jar:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
@@ -55,7 +55,7 @@
<arg value="ejb/ejb_stubs_ejbapp_HelloBean"/>
<arg value="${ic.props}"/>
</java>
- </target>
+ </target>
<!--This target is used to test that using no-arg InitialContext and
not setting any vm params will still work, assuming the default
@@ -63,13 +63,13 @@
tests run b/c of the port change possibility. However, if the
default port of 3700 is set, this test should work. -->
<target name="runclient_setnothing" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
<arg value="ejb/ejb_stubs_ejbapp_HelloBean"/>
</java>
- </target>
+ </target>
<target name="run_default" depends="init-common">
<antcall target="runclient_nooverride">
@@ -94,7 +94,7 @@
<target name="runclient_withoverride" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
@@ -105,7 +105,7 @@
<arg value="ejb/ejb_stubs_ejbapp_HelloBean"/>
<arg value="jndi.properties.s1as8_default"/>
</java>
- </target>
+ </target>
<target name="run_cosnaming_override" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java
index 75d0f05..ce0a85c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java
@@ -35,13 +35,13 @@
public static void main(String[] args)
{
try {
- // Step 1: It is important to call initailizeSystemProperties to
- // avoid problems with switching ORBs between J2SE and AppServer.
- // These are system properties that needs to be run once or these
+ // Step 1: It is important to call initailizeSystemProperties to
+ // avoid problems with switching ORBs between J2SE and AppServer.
+ // These are system properties that needs to be run once or these
// properties can be passed through -D flags
initializeSystemProperties( );
-
- // Step 2: Now do the EJB lookup, and call the methods on the
+
+ // Step 2: Now do the EJB lookup, and call the methods on the
// Metadata Object
getContext();
@@ -49,9 +49,9 @@
EJBHome home = getHome( boundObj );
getMetaData( home );
- // Step 3: Repeat Step 2 as many times as needed. Although the
+ // Step 3: Repeat Step 2 as many times as needed. Although the
// advise is to pass "javax.naming.CORBA.ORB" property
- // to avoid huge memory footprint due to new initialContexts.
+ // to avoid huge memory footprint due to new initialContexts.
// Remember every new InitialContext will initialize a new ORB
// which is very expensive memory wise.
/*PG->
@@ -64,7 +64,7 @@
getMetaData( home );
}
*/
-
+
} catch ( Exception e ) {
e.printStackTrace( );
System.out.println( e );
@@ -73,16 +73,16 @@
// Initialize to use SUN ONE AppServer 7 ORB and UtilDelegate
- // NOTE: All these are OMG standard properties provided to plug in an ORB
+ // NOTE: All these are OMG standard properties provided to plug in an ORB
// to JDK
private static void initializeSystemProperties( ) {
System.setProperty( "org.omg.CORBA.ORBClass",
"com.sun.corba.ee.impl.orb.ORBImpl" );
- System.setProperty( "javax.rmi.CORBA.UtilClass",
+ System.setProperty( "javax.rmi.CORBA.UtilClass",
"com.sun.corba.ee.impl.javax.rmi.CORBA.Util" );
System.setProperty( "javax.rmi.CORBA.StubClass",
- "com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl");
+ "com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl");
System.setProperty( "javax.rmi.CORBA.PortableRemoteClass",
"com.sun.corba.ee.impl.javax.rmi.PortableRemoteObject");
}
@@ -91,24 +91,24 @@
public static void getContext()
{
Properties _props = new Properties();
- _props.put(Context.INITIAL_CONTEXT_FACTORY,
+ _props.put(Context.INITIAL_CONTEXT_FACTORY,
"org.glassfish.jndi.cosnaming.CNCtxFactory");
_props.put(Context.PROVIDER_URL, "iiop://achumba:3700");
try {
_context = new InitialContext(_props);
} catch(NamingException ne) {
- System.out.println("test - 'new InitialContext()'" +
+ System.out.println("test - 'new InitialContext()'" +
"threw this: type(" + ne.getClass().getName() +
"), msg(" + ne.getMessage() + ")");
Throwable rootCause = ne.getRootCause();
- System.out.println("test.initialContext -" +
- "root cause of previous exception: " + "type(" +
- rootCause.getClass().getName() + "), msg(" +
+ System.out.println("test.initialContext -" +
+ "root cause of previous exception: " + "type(" +
+ rootCause.getClass().getName() + "), msg(" +
rootCause.getMessage() + ")");
}
}
-
+
//DoLookup
@@ -118,12 +118,12 @@
try {
boundObj = _context.lookup(inName);
} catch(NamingException ne) {
- System.out.println("test - 'lookup()'" + "threw this: type(" +
+ System.out.println("test - 'lookup()'" + "threw this: type(" +
ne.getClass().getName() + "), msg(" + ne.getMessage() + ")");
Throwable rootCause = ne.getRootCause();
- System.out.println("test.lookup -" +
- "root cause of previous exception: " + "type(" +
- rootCause.getClass().getName() + "), msg(" +
+ System.out.println("test.lookup -" +
+ "root cause of previous exception: " + "type(" +
+ rootCause.getClass().getName() + "), msg(" +
rootCause.getMessage() + ")");
}
return boundObj;
@@ -146,11 +146,11 @@
EJBMetaData meta=null;
try {
meta = formalboundHome.getEJBMetaData();
- System.out.println( "meta.getClass().getName() = " +
+ System.out.println( "meta.getClass().getName() = " +
meta.getClass().getName() );
} catch(Exception ne) {
ne.printStackTrace();
- System.out.println("test - 'metadata()'" + "threw this: type(" +
+ System.out.println("test - 'metadata()'" + "threw this: type(" +
ne.getClass().getName() + "), msg(" + ne.getMessage() + ")");
}
if(meta != null)
@@ -161,8 +161,8 @@
try {
tempClass = meta.getHomeInterfaceClass();
} catch(Error e) {
- System.out.println(
- "found EJB Home,meta.getHomeInterfaceClass() " +
+ System.out.println(
+ "found EJB Home,meta.getHomeInterfaceClass() " +
e.getMessage() );
tempClass = null;
}
@@ -171,6 +171,6 @@
System.out.println("HomeInteface"+tempClass);
meta = null;
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java
index fd77433..65e48c9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java
@@ -34,56 +34,56 @@
public class Client {
private Context ic;
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
stat.addDescription("ejb-stubs-standaloneclient");
- // Step 1: It is important to call initailizeSystemProperties to
- // avoid problems with switching ORBs between J2SE and AppServer.
- // These are system properties that needs to be run once or these
+ // Step 1: It is important to call initailizeSystemProperties to
+ // avoid problems with switching ORBs between J2SE and AppServer.
+ // These are system properties that needs to be run once or these
// properties can be passed through -D flags
//PG-> initializeSystemProperties( );
-
+
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-stubs-standaloneclientID");
- }
-
+ }
+
public Client (String[] args) {
try {
- setupInitialContext( "achumba" , "3700" );
+ setupInitialContext( "achumba" , "3700" );
// ic = new InitialContext();
} catch(Exception e) {
System.out.println(
- "standaloneclient.Client(), Exception when setting " +
+ "standaloneclient.Client(), Exception when setting " +
"up the InitialContext environment");
e.printStackTrace();
- }
+ }
}
-
+
public void doTest() {
try {
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("ejb/ejb_stubs_ejbapp_HelloBean");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
@@ -108,33 +108,33 @@
e.printStackTrace();
stat.addStatus("standaloneclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
- private void setupInitialContext( String host, String port )
- throws Exception
+ private void setupInitialContext( String host, String port )
+ throws Exception
{
Properties env = new Properties();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.enterprise.naming.SerialInitContextFactory");
-
+
env.put( Context.PROVIDER_URL, "iiop://" + host + ":" + port );
ic = new InitialContext( env );
}
// Initialize to use SUN ONE AppServer 7 ORB and UtilDelegate
- // NOTE: All these are OMG standard properties provided to plug in an ORB
+ // NOTE: All these are OMG standard properties provided to plug in an ORB
// to JDK
private static void initializeSystemProperties( ) {
System.setProperty( "org.omg.CORBA.ORBClass",
"com.sun.corba.ee.impl.orb.ORBImpl" );
- System.setProperty( "javax.rmi.CORBA.UtilClass",
+ System.setProperty( "javax.rmi.CORBA.UtilClass",
"com.sun.corba.ee.impl.javax.rmi.CORBA.Util" );
System.setProperty( "javax.rmi.CORBA.StubClass",
- "com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl");
+ "com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl");
System.setProperty( "javax.rmi.CORBA.PortableRemoteClass",
"com.sun.corba.ee.impl.javax.rmi.PortableRemoteObject");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java
index 2b3a40c..3ea07c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java
@@ -27,7 +27,7 @@
public class SimpleClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -47,8 +47,8 @@
}
stat.printSummary("ejb-stubs-standaloneclient");
- }
-
+ }
+
private String jndiName;
private String propsFileName;
@@ -58,7 +58,7 @@
if( (args.length > 1) && (args[1].length() > 0) ) {
propsFileName = args[1];
- System.out.println("Using props file " + propsFileName +
+ System.out.println("Using props file " + propsFileName +
" for InitialContext");
} else {
System.out.println("Using no-arg InitialContext");
@@ -75,9 +75,9 @@
Properties props = new Properties();
FileInputStream fis = new FileInputStream(propsFileName);
props.load(fis);
- System.out.println("Using props = " + props);
+ System.out.println("Using props = " + props);
ic = new InitialContext(props);
- System.out.println("ic = " + ic);
+ System.out.println("ic = " + ic);
}
return ic;
@@ -86,47 +86,47 @@
private void doTest() throws Exception {
Context ic = getContext();
-
+
System.out.println("Looking up global jndi name = " + jndiName);
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup(jndiName);
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
System.out.println("successfully invoked ejb");
-
- EJBMetaData md = home.getEJBMetaData();
+
+ EJBMetaData md = home.getEJBMetaData();
System.out.println("Got EJB meta data = " + md);
-
- EJBMetaData md2 = home.getEJBMetaData();
+
+ EJBMetaData md2 = home.getEJBMetaData();
System.out.println("Got EJB meta data again = " + md2);
-
+
HomeHandle homeHandle = home.getHomeHandle();
System.out.println("Got Home Handle");
HelloHome home2 = (HelloHome) homeHandle.getEJBHome();
System.out.println("Converted Home Handle back to HelloHome");
- EJBMetaData md3 = home2.getEJBMetaData();
+ EJBMetaData md3 = home2.getEJBMetaData();
System.out.println("Got EJB meta data a 3rd time = " + md3);
-
+
Handle helloHandle = hr.getHandle();
System.out.println("Got hello Handle");
Hello hello2 = (Hello) helloHandle.getEJBObject();
System.out.println("Converted Hello Handle back to Hello");
hello2.sayHello();
System.out.println("successfully invoked ejb again");
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.properties
index b3807b9..a2aefba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-stubcount-ejb1.jar"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="app.type" value="ejb"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.xml
index 51ce673..44084b6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.xml
@@ -34,29 +34,29 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
- </antcall>
+ </antcall>
</target>
<target name="build" depends="compile">
<antcall target="mybuild">
<param name="buildnum" value="1"/>
- </antcall>
+ </antcall>
<antcall target="mybuild">
<param name="buildnum" value="2"/>
- </antcall>
+ </antcall>
<antcall target="mybuild">
<param name="buildnum" value="3"/>
- </antcall>
+ </antcall>
<antcall target="mybuild">
<param name="buildnum" value="5"/>
- </antcall>
+ </antcall>
<antcall target="mybuild">
<param name="buildnum" value="10"/>
- </antcall>
+ </antcall>
</target>
<target name="mybuild" >
@@ -68,28 +68,28 @@
<param name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar${buildnum}.xml"/>
<param name="ejb.jar"
value="${assemble.dir}/ejb-stubs-stubcount${buildnum}-ejb.jar"/>
-</antcall>
- </target>
-
+</antcall>
+ </target>
+
<target name="deploy">
<antcall target="mydeploy">
<param name="buildnum" value="1"/>
- </antcall>
+ </antcall>
<antcall target="mydeploy">
<param name="buildnum" value="2"/>
- </antcall>
+ </antcall>
<antcall target="mydeploy">
<param name="buildnum" value="3"/>
- </antcall>
+ </antcall>
<antcall target="mydeploy">
<param name="buildnum" value="5"/>
- </antcall>
+ </antcall>
<antcall target="mydeploy">
<param name="buildnum" value="10"/>
- </antcall>
+ </antcall>
</target>
- <target name="mydeploy"
+ <target name="mydeploy"
depends="init-common">
<antcall target="deploy-jar-common">
<param name="appname" value="ejb-stubs-stubcount${buildnum}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/descriptor/ejb-jar2.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/descriptor/ejb-jar2.xml
index d346a60..014f477 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/descriptor/ejb-jar2.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/descriptor/ejb-jar2.xml
@@ -44,7 +44,7 @@
<security-identity>
<use-caller-identity/>
</security-identity>
- </session>
+ </session>
</enterprise-beans>
<assembly-descriptor>
</assembly-descriptor>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java
index 144d448..ed2e920 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -32,14 +32,14 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
- public void sayFoo() {
+ public void sayFoo() {
}
public void ejbRemove() throws RemoteException {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.properties
index f3ef441..88824a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-stubser"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="se.client" value="com.sun.s1asdev.ejb.stubs.stubser.client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.xml
index 3990ae8..f60244a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.xml
@@ -36,7 +36,7 @@
<delete file="homehandle"/>
<delete file="foohandle"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,26 +48,26 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo.class,**/*FooHome.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
- <!-- temporarily comment out test that reconstitutes handle from file.
+ <!-- temporarily comment out test that reconstitutes handle from file.
<antcall target="run_handle"/>
- -->
+ -->
</target>
-
+
<target name="run_handle" depends="init-common">
<antcall target="runclient-common">
<param name="appclient.application.args" value="handle"/>
@@ -80,7 +80,7 @@
</target>
<target name="run_se_nohandle" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -88,17 +88,17 @@
</target>
<target name="run_se_handle" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
- <arg line="handle"/>
+ <arg line="handle"/>
</java>
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java
index 157bb8d..7ba676b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java
@@ -31,19 +31,19 @@
private static final String HOME_HANDLE_FILE = "homehandle";
private static final String FOO_HANDLE_FILE = "foohandle";
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
- System.out.println("cp = " + System.getProperty("java.class.path"));
+ System.out.println("cp = " + System.getProperty("java.class.path"));
Client client = new Client(args);
- System.out.println("args.length = " + args.length);
- for(int i = 0; i < args.length; i++) {
- System.out.println("arg " + i + " = " + args[0]);
- }
-
+ System.out.println("args.length = " + args.length);
+ for(int i = 0; i < args.length; i++) {
+ System.out.println("arg " + i + " = " + args[0]);
+ }
+
if( args.length == 1) {
stat.addDescription("ejb-stubs-stubser2");
@@ -54,35 +54,35 @@
client.doTest();
stat.printSummary("ejb-stubs-stubser1ID");
}
-
- }
-
+
+ }
+
public Client (String[] args) {
}
-
+
public void doRestartTest() {
try {
// when we lookup a FooHome *before* deserializing the home reference,
// everything works
- // @@@
+ // @@@
System.out.println("Adding lookup before reconstitution ...");
lookupHome();
System.out.println("Attempting to reconstruct foo handle");
- Handle fh = (Handle) readFromFile(FOO_HANDLE_FILE);
+ Handle fh = (Handle) readFromFile(FOO_HANDLE_FILE);
Foo f = (Foo) fh.getEJBObject();
- f.callHello();
-
- System.out.println("successfully invoked foo via reconsituted handle");
+ f.callHello();
+
+ System.out.println("successfully invoked foo via reconsituted handle");
System.out.println("Attempting to reconstruct home handle as first" +
" operation in client");
HomeHandle hh = (HomeHandle) readFromFile(HOME_HANDLE_FILE);
invoke((FooHome) hh.getEJBHome());
- System.out.println("successfully invoked ejb via reconsituted home");
+ System.out.println("successfully invoked ejb via reconsituted home");
-
+
stat.addStatus("ejbclient restart2", stat.PASS);
} catch(Exception e) {
@@ -98,10 +98,10 @@
FooHome home = lookupHome();
-
+
System.err.println("Narrowed home!!");
-
-
+
+
// create home handle
HomeHandle hh = home.getHomeHandle();
@@ -112,12 +112,12 @@
Foo f = invoke(home);
System.out.println("successfully invoked ejb via reconsituted home");
- // create SFSB instance handle file
+ // create SFSB instance handle file
Handle fh = f.getHandle();
serializeToFile(FOO_HANDLE_FILE, fh);
Handle fh2 = (Handle) readFromFile(FOO_HANDLE_FILE);
Foo f2 = (Foo) fh2.getEJBObject();
- f2.callHello();
+ f2.callHello();
System.out.println("successfully invoked ejb");
@@ -127,37 +127,37 @@
e.printStackTrace();
stat.addStatus("ejbclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
private FooHome lookupHome() throws Exception {
Context ic = new InitialContext();
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:global/ejb-stubs-stubserApp/ejb-stubs-stubser-ejb/FooBean");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
return home;
}
-
+
private Foo invoke(FooHome fooHome) throws Exception {
Foo f = fooHome.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
f.callHello();
- return f;
+ return f;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java
index 22143f9..b70a074 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java
@@ -19,7 +19,7 @@
import java.util.Date;
import java.util.Collection;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -36,20 +36,20 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
helloHome = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
hello = helloHome.create();
@@ -64,14 +64,14 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void callHello() {
System.out.println("in FooBean::callHello()");
try {
-
+
hello.sayHello();
System.out.println("successfully invoked ejb");
@@ -84,7 +84,7 @@
throw ise;
}
-
+
}
public void ejbRemove() throws RemoteException {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java
index 8713eba..03d6c86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -31,11 +31,11 @@
public HelloBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In HelloBean::ejbCreate !!");
+ System.out.println("In HelloBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void sayHello() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.properties
index 8415d5e..9a28259 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-webclient"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.xml
index 2c0cdb6..cb0b8e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,16 +46,16 @@
<target name="build" depends="compile">
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="true"/>
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -65,10 +65,10 @@
<param name="appclient.application.args" value="${http.host} ${http.port}"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/client/Client.java
index 8fc3492..84c3cc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/client/Client.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
private String host;
private String port;
@@ -35,23 +35,23 @@
host = ( args.length > 0) ? args[0] : "localhost";
port = ( args.length > 1) ? args[1] : "4848";
}
-
+
public static void main(String[] args) {
stat.addDescription("ejb-stubs-webclient");
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-stubs-webclientID");
}
-
+
public void doTest() {
-
+
String env = null;
try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/ejb-stubs-webclient/servlet";
System.out.println("invoking webclient servlet at " + url);
int code = invokeServlet(url);
-
+
if(code != 200) {
System.out.println("Incorrect return code: " + code);
stat.addStatus("webclient main", stat.FAIL);
@@ -63,15 +63,15 @@
stat.addStatus("webclient main", stat.FAIL);
ex.printStackTrace();
}
-
+
return;
-
+
}
private int invokeServlet(String url) throws Exception {
-
+
URL u = new URL(url);
-
+
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
@@ -84,6 +84,6 @@
}
return code;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/web.xml
index 7d36855..b28878f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/web.xml
@@ -36,7 +36,7 @@
<home>com.sun.s1asdev.ejb.stubs.ejbapp.HelloHome</home>
<remote>com.sun.s1asdev.ejb.stubs.ejbapp.Hello</remote>
</ejb-ref>
-<!--
+<!--
<ejb-ref>
<ejb-ref-name>ejb/dummymejb</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java
index af9ebb3..05dffeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java
@@ -29,29 +29,29 @@
//import javax.management.j2ee.Management;
public class Servlet extends HttpServlet {
-
+
public void init( ServletConfig config) throws ServletException {
-
+
super.init(config);
System.out.println("In webclient::servlet... init()");
}
-
+
public void service ( HttpServletRequest req , HttpServletResponse resp ) throws ServletException, IOException {
-
+
resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
-
+
try {
InitialContext ic = new InitialContext();
System.out.println("Skipping mejb test for now. NEED TO REENABLE");
- // System.out.println("Calling DummyMEJBBean");
+ // System.out.println("Calling DummyMEJBBean");
- /* TODO reenable once javax.management classes are available
+ /* TODO reenable once javax.management classes are available
Object objref = ic.lookup("java:comp/env/ejb/dummymejb");
- ManagementHome mHome = (ManagementHome)
+ ManagementHome mHome = (ManagementHome)
PortableRemoteObject.narrow(objref, ManagementHome.class);
Management dummyMejb = mHome.create();
@@ -59,22 +59,22 @@
dummyMejb.getMBeanCount();
System.out.println("dummy mejb test successful");
- */
+ */
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
- Object objref2 = ic.lookup("java:comp/env/ejb/hello");
+ // create EJB using factory from container
+ Object objref2 = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref2);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref2, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
@@ -83,22 +83,22 @@
out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
-
+
}catch (Exception ex) {
ex.printStackTrace();
System.out.println("webclient servlet test failed");
throw new ServletException(ex);
- }
+ }
}
-
-
+
+
public void destroy() {
System.out.println("in webclient::servlet destroy");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/tests/cache/Client.java b/appserver/tests/appserv-tests/devtests/ejb/tests/cache/Client.java
index 506213e..790c5b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/tests/cache/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/tests/cache/Client.java
@@ -22,7 +22,7 @@
public class Client {
- String cacheName;
+ String cacheName;
int cacheSize, resizeQuantity;
long idleTimeout; // idleTimeout value in milliseconds
float loadFactor;
@@ -69,11 +69,11 @@
createObjects();
addCacheEntries();
if ( debug )
- displayCacheEntries( "Display items in cache after adding" );
+ displayCacheEntries( "Display items in cache after adding" );
removeCacheEntries();
if ( debug )
- System.out.println( "Total items in cache (" + cacheName +
+ System.out.println( "Total items in cache (" + cacheName +
") after remove call = " + getEntryCount() );
addCacheEntries();
@@ -99,7 +99,7 @@
System.out.println( "\n\nIn createCache of Cache(" + cacheName + ")" );
if ( cacheSize <= 0 && idleTimeout <= 0 ) {
if ( debug )
- System.out.println( "\t\tCreating BaseCache for cacheSize = " + cacheSize +
+ System.out.println( "\t\tCreating BaseCache for cacheSize = " + cacheSize +
" :resizeQuantity = " + resizeQuantity + " ::loadFactor = " + loadFactor );
cache = new BaseCache();
cache.init( DEFAULT_CACHE_SIZE, DEFAULT_LOAD_FACTOR, null );
@@ -108,7 +108,7 @@
LruCache lru = new LruCache( DEFAULT_CACHE_SIZE);
calculateLoadFactor();
if ( debug )
- System.out.println( "\t\tCreating LruCache for cacheSize = " + cacheSize +
+ System.out.println( "\t\tCreating LruCache for cacheSize = " + cacheSize +
" :resizeQuantity = " + resizeQuantity + " ::loadFactor = " + loadFactor );
lru.init( cacheSize, idleTimeout, loadFactor, null );
cache = lru;
@@ -125,7 +125,7 @@
for( int i = 0; i < MAX_TEST_ENTRIES; i++ ) {
dummys[i] = new DummyObject( i );
}
- } //createObjects()
+ } //createObjects()
private void addCacheEntries() {
Object obj;
@@ -176,13 +176,13 @@
}
} //DummyObject{}
- class ExpiredItemTask
+ class ExpiredItemTask
extends java.util.TimerTask {
-
+
public void run() {
- cache.trimExpiredEntries( resizeQuantity );
+ cache.trimExpiredEntries( resizeQuantity );
}
- } //ExpiredItemTask
+ } //ExpiredItemTask
@@ -265,22 +265,22 @@
}
if ( debug ) {
- System.out.println (
+ System.out.println (
"\n\nList all the items in all the caches to ensure that the idle timeout works correctly" );
-
+
System.out.println ( "\t\t Total items in cache (c0) = " + c0.getEntryCount() );
System.out.println ( "\t\t Total items in cache (c1) = " + c1.getEntryCount() );
System.out.println ( "\t\t Total items in cache (c2) = " + c2.getEntryCount() );
System.out.println ( "\t\t Total items in cache (c3) = " + c3.getEntryCount() );
System.out.println ( "\t\t Total items in cache (c4) = " + c4.getEntryCount() );
- c0.displayCacheEntries( "List items in cache after timeout " );
- c1.displayCacheEntries( "List items in cache after timeout " );
- c2.displayCacheEntries( "List items in cache after timeout " );
- c3.displayCacheEntries( "List items in cache after timeout " );
- c4.displayCacheEntries( "List items in cache after timeout " );
+ c0.displayCacheEntries( "List items in cache after timeout " );
+ c1.displayCacheEntries( "List items in cache after timeout " );
+ c2.displayCacheEntries( "List items in cache after timeout " );
+ c3.displayCacheEntries( "List items in cache after timeout " );
+ c4.displayCacheEntries( "List items in cache after timeout " );
}
-
+
success = 0;
failure = 0;
@@ -318,7 +318,7 @@
System.out.println ( "\nActual failure count = " + failure );
timer.cancel();
-
+
} //main()
} //Client {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/build.xml
index 6bda49e..e881b1a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/build.xml
@@ -61,16 +61,16 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-timer tests)
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-timer tests)
- ant mdbtimer (Executes the ejb-timer mdbtimer
+ ant mdbtimer (Executes the ejb-timer mdbtimer
- ant sessiontimer (Executes the ejb-timer sessiontimer test)
- ant timertests (Executes the ejb-timer timertests test)
- ant timerserialization (Executes the ejb-timer serialization test)
+ ant sessiontimer (Executes the ejb-timer sessiontimer test)
+ ant timertests (Executes the ejb-timer timertests test)
+ ant timerserialization (Executes the ejb-timer serialization test)
- </echo>
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.properties b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.properties
index 804c74f..31816a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-mdbtimer"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.xml
index 4d62c9c..a59a067 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java
index 6def4a3..c532dc7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java
@@ -46,7 +46,7 @@
private int numMessages = 2;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -67,20 +67,20 @@
public void setup() throws Exception {
context = new InitialContext();
-
- QueueConnectionFactory queueConFactory =
+
+ QueueConnectionFactory queueConFactory =
(QueueConnectionFactory) context.lookup
("java:comp/env/FooCF");
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
targetDest = (jakarta.jms.Queue) context.lookup("java:comp/env/jms/MsgBeanQueue");
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(targetDest);
+ queueSender = queueSession.createSender(targetDest);
clientDest = (jakarta.jms.Queue) context.lookup("java:comp/env/jms/ClientQueue");
@@ -101,7 +101,7 @@
}
}
- public void sendMsg(Message msg)
+ public void sendMsg(Message msg)
throws JMSException {
System.out.println("Sending message to " +
" at time " + System.currentTimeMillis());
@@ -114,7 +114,7 @@
System.out.println("Waiting for queue message ");
Message recvdmessage = queueReceiver.receive(timeout);
if( recvdmessage != null ) {
- System.out.println("Received message : " + recvdmessage +
+ System.out.println("Received message : " + recvdmessage +
" at " + new Date());
} else {
System.out.println("timeout after " + timeout + " seconds");
@@ -131,11 +131,11 @@
ObjectMessage recvMsg1 = (ObjectMessage) recvQueueMsg(20000);
Date cancellation = (Date) recvMsg1.getObject();
-
+
Date now = new Date();
-
+
// wait for message after timer is cancelled (plus some buffer time)
- long wait = now.before(cancellation) ?
+ long wait = now.before(cancellation) ?
(cancellation.getTime() - now.getTime()) + 30000 : 0;
System.out.println("Timer will be cancelled after " + cancellation);
System.out.println("Waiting for cancellation notification until " +
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
index ba895ed..14e589e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
@@ -22,7 +22,7 @@
import javax.naming.*;
import java.util.Date;
-public class MessageBean
+public class MessageBean
implements MessageDrivenBean, MessageListener,TimedObject {
private MessageDrivenContext mdc;
@@ -53,7 +53,7 @@
System.out.println("Sending message " + message);
sender.send(message);
System.out.println("message sent");
-
+
} catch(NamingException e) {
e.printStackTrace();
}
@@ -90,7 +90,7 @@
Date now = new Date();
Date expire = new Date(now.getTime() + 25000);
System.out.println("Creating periodic timer at " + now);
- Timer t = mdc.getTimerService().createTimer(10000, 10000,
+ Timer t = mdc.getTimerService().createTimer(10000, 10000,
expire);
System.out.println("Timer will be cancelled on first expiration after " +
expire);
@@ -100,7 +100,7 @@
System.out.println("Sending message " + outMessage);
sender.send(outMessage);
System.out.println("message sent");
-
+
} catch(Exception e) {
System.out.println("got exception in message bean");
e.printStackTrace();
@@ -117,16 +117,16 @@
}
public void setMessageDrivenContext(MessageDrivenContext mdc) {
- this.mdc = mdc;
- System.out.println("In MessageDrivenEJB::setMessageDrivenContext !!");
+ this.mdc = mdc;
+ System.out.println("In MessageDrivenEJB::setMessageDrivenContext !!");
}
public void ejbCreate() throws RemoteException {
- System.out.println("In MessageDrivenEJB::ejbCreate !!");
+ System.out.println("In MessageDrivenEJB::ejbCreate !!");
}
public void ejbRemove() {
- System.out.println("In MessageDrivenEJB::ejbRemove !!");
+ System.out.println("In MessageDrivenEJB::ejbRemove !!");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.properties b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.properties
index 88836a2..4c33a60 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-restore"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.xml
index c6cc82c..e727798 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.xml
@@ -35,7 +35,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,14 +47,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -64,7 +64,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -78,14 +78,14 @@
<param name="appclient.application.args" value="restore"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
index fe5c5c0..f06a6bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
@@ -31,9 +31,9 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
-
- private static SimpleReporterAdapter stat =
+
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
String jndiName = "ejb/ejb_timer_sessiontimer_TimerSession";
@@ -55,12 +55,12 @@
if( args.length == 1) {
afterRestart = args[0].equalsIgnoreCase("restore");
- }
+ }
}
public String doTest() {
String result = kTestPassed;
- QueueConnection connection = null;
+ QueueConnection connection = null;
TimerSession remoteObj = null;
String testName = jndiName;
@@ -68,18 +68,18 @@
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref " + ejbName);
System.out.println("Doing timer test for " + jndiName);
java.lang.Object objref = ic.lookup("java:comp/env/" + ejbName);
- System.out.println("---ejb stub---" +
+ System.out.println("---ejb stub---" +
objref.getClass().getClassLoader());
- System.out.println("---ejb classname---" +
+ System.out.println("---ejb classname---" +
objref.getClass().getName());
- System.out.println("---TimerSessionHome---" +
+ System.out.println("---TimerSessionHome---" +
TimerSessionHome.class.getClassLoader());
System.err.println("Looked up home!!");
@@ -87,7 +87,7 @@
TimerSessionHome home = (TimerSessionHome)
PortableRemoteObject.narrow(objref, TimerSessionHome.class);
-
+
remoteObj = home.create();
String otherServer1 = "foo";
@@ -96,59 +96,59 @@
testName = "afterRestart";
System.out.println("Migrating timers from " + otherServer1);
remoteObj.migrateTimersFrom(otherServer1);
-
+
} else {
remoteObj.createTimer(5000, 0, "timer1");
remoteObj.createTimer(30000, 0, "timer2");
remoteObj.createTimer(60000000, 0, "timer3");
remoteObj.createTimer(5000, 12000, "timer4");
remoteObj.createTimer(5000, 30000, "timer5");
- remoteObj.createTimer(5000, 100000000, "timer6");
-
+ remoteObj.createTimer(5000, 100000000, "timer6");
+
// simulate creation of timers within another server
// instance. none of these should timeout until we
// do a migration
-
+
remoteObj.createTimerInOtherServer
(otherServer1, "other_timer7",
- 1000, 0,
+ 1000, 0,
"other_timer7");
remoteObj.createTimerInOtherServer
(otherServer1, "other_timer8",
- 10000000000L, 0,
- "other_timer8");
-
+ 10000000000L, 0,
+ "other_timer8");
+
remoteObj.createTimerInOtherServer
(otherServer1, "other_timer9",
- 1000, 10000000000L,
+ 1000, 10000000000L,
"other_timer9");
remoteObj.createTimerInOtherServer
(otherServer1, "other_timer10",
- 100000000, 1000,
+ 100000000, 1000,
"other_timer10");
remoteObj.createTimerInOtherServer
(otherServer1, "other_timer11",
- 30000, 100000000,
+ 30000, 100000000,
"other_timer11");
// create a couple of timers for another simulated
// server. we will not be migrating these timers, so
// by verifying that we don't get notifications from these
// timers we test that the migration only happens for
- // the specified server.
+ // the specified server.
remoteObj.createTimerInOtherServer
("bar", "bar_timer12", 1000, 0, "bar_timer12");
remoteObj.createTimerInOtherServer
("bar", "bar_timer13", 1000, 1000, "bar_timer13");
-
+
}
-
+
QueueConnectionFactory qcFactory = (QueueConnectionFactory)
ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
System.out.println (" qcFactory = " + qcFactory);
@@ -157,7 +157,7 @@
System.out.println (" queue = " + queue);
connection = qcFactory.createQueueConnection();
- QueueSession session =
+ QueueSession session =
connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
QueueReceiver receiver = session.createReceiver(queue);
connection.start();
@@ -167,7 +167,7 @@
if( afterRestart ) {
toReceive.add("timer2");
toReceive.add("timer4");
- toReceive.add("timer5");
+ toReceive.add("timer5");
// migrated timers
toReceive.add("other_timer7");
@@ -181,37 +181,37 @@
toReceive.add("timer6");
}
- long waitTime = afterRestart ?
+ long waitTime = afterRestart ?
40000 : 10000;
-
+
while(true) {
System.out.println("Waiting for message");
Message message = receiver.receive(waitTime);
TextMessage textMsg = (TextMessage)message;
-
- if ( (message == null) ||
+
+ if ( (message == null) ||
(! toReceive.contains(textMsg.getText())) ) {
- throw new Exception("Received a invalid message " +
+ throw new Exception("Received a invalid message " +
message + " TimeOut failed!!");
- }
+ }
received.add(textMsg.getText());
- System.out.println("Received Message : " +
+ System.out.println("Received Message : " +
textMsg.getText());
- System.out.println("Messages received so far : " +
- received);
+ System.out.println("Messages received so far : " +
+ received);
if( received.equals(toReceive) ) {
System.out.println("Got all expected messages");
break;
}
}
-
+
stat.addStatus("sessiontimer " + testName, stat.PASS);
if( afterRestart ) {
remoteObj.deleteTimers();
- }
+ }
} catch(Exception e) {
System.out.println("TimerSession : " + testName + " test failed");
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java
index b67ce95..165a2ad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java
@@ -27,7 +27,7 @@
public void migrateTimersFrom(String owner) throws RemoteException;
- public void createTimerInOtherServer(String owner, String timerId,
+ public void createTimerInOtherServer(String owner, String timerId,
long initialExpiration,
long intervalDuration, String info)
throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
index 9d4b1c7..1a85612 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
@@ -38,35 +38,35 @@
import com.sun.ejb.containers.TimerBean;
-public class TimerSessionEJB implements TimedObject, SessionBean
+public class TimerSessionEJB implements TimedObject, SessionBean
{
private SessionContext context;
private QueueConnection connection;
private QueueSession session;
private Queue queue;
private QueueSender sender;
-
+
public void ejbCreate() throws RemoteException {}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void setSessionContext(SessionContext sc) {
context = sc;
}
-
-
+
+
// business method to create a timer
public TimerHandle createTimer(long initialDelay, long interval,
String msg) {
-
+
try {
System.out.println("Calling getMessageContext");
context.getMessageContext();
} catch(IllegalStateException ise) {
System.out.println("getMessageContext() successfully threw illegalStateException");
}
-
-
+
+
TimerService timerService = context.getTimerService();
Timer timer;
if( interval == 0 ) {
@@ -77,15 +77,15 @@
}
return timer.getHandle();
}
-
- public void createTimerInOtherServer(String owner, String timerId,
+
+ public void createTimerInOtherServer(String owner, String timerId,
long initialExpiration,
long intervalDuration, String info) {
try {
Date now = new Date();
- TimerBean.testCreate(timerId, context, owner,
- new Date(now.getTime() + initialExpiration),
+ TimerBean.testCreate(timerId, context, owner,
+ new Date(now.getTime() + initialExpiration),
intervalDuration,
info);
} catch(Exception e) {
@@ -96,7 +96,7 @@
}
public void migrateTimersFrom(String owner) {
-
+
TimerBean.testMigrate(owner);
}
@@ -114,31 +114,31 @@
// timer callback method
public void ejbTimeout(Timer timer) {
-
+
String info = (String) timer.getInfo();
System.out.println("Got ejbTimeout for timer " + info);
-
+
try {
System.out.println("Calling getMessageContext");
context.getMessageContext();
} catch(IllegalStateException ise) {
System.out.println("getMessageContext() successfully threw illegalStateException");
}
-
-
+
+
// add message to queue
try {
-
-
+
+
InitialContext ic = new InitialContext();
QueueConnectionFactory qcFactory = (QueueConnectionFactory)
ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
Queue queue = (Queue) ic.lookup("java:comp/env/jms/MyQueue");
connection = qcFactory.createQueueConnection();
-
+
QueueSession session = connection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
sender = session.createSender(queue);
-
+
TextMessage message = session.createTextMessage();
message.setText(info);
System.out.println("Sending time out message");
@@ -160,7 +160,7 @@
}
}
}
-
+
public void ejbActivate() {}
public void ejbPassivate() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java
index 1c04f5d..5053cdc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java
@@ -21,5 +21,5 @@
import jakarta.ejb.CreateException;
public interface TimerSessionHome extends EJBHome {
- TimerSession create() throws CreateException, RemoteException;
+ TimerSession create() throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.properties b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.properties
index 25b18c7..90ee31e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-sessiontimer"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.xml
index d55777e..e24a9e2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/TimerSingletonRemote.class,**/TimerSessionHome.class,**/TimerSession.class,**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java
index 7f525df..253847c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java
@@ -35,9 +35,9 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
-
- private static SimpleReporterAdapter stat =
+
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
String jndiName = "ejb/ejb_timer_sessiontimer_TimerSession";
@@ -67,44 +67,44 @@
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref " + ejbName);
System.out.println("Doing timer test for " + jndiName);
//PG-> Object objref = ic.lookup(jndiName);
// java.lang.Object objref = ic.lookup("java:comp/env/" + ejbName);
- java.lang.Object objref = ic.lookup("ejb/ejb_timer_sessiontimer_TimerSession");
+ java.lang.Object objref = ic.lookup("ejb/ejb_timer_sessiontimer_TimerSession");
- System.out.println("---ejb stub---" +
+ System.out.println("---ejb stub---" +
objref.getClass().getClassLoader());
- System.out.println("---ejb classname---" +
+ System.out.println("---ejb classname---" +
objref.getClass().getName());
- System.out.println("---TimerSessionHome---" +
+ System.out.println("---TimerSessionHome---" +
TimerSessionHome.class.getClassLoader());
System.err.println("Looked up home!!");
- TimerSingletonRemote tsr = (TimerSingletonRemote)
- ic.lookup("ejb/ejb_timer_sessiontimer_TimerSingleton");
+ TimerSingletonRemote tsr = (TimerSingletonRemote)
+ ic.lookup("ejb/ejb_timer_sessiontimer_TimerSingleton");
// clear out singleton state. This allows multiple test
// runs without having to redeploy
- tsr.startTest();
+ tsr.startTest();
TimerSessionHome home = (TimerSessionHome)
PortableRemoteObject.narrow(objref, TimerSessionHome.class);
-
+
remoteObj = home.create();
- int timeoutInSeconds = 5;
+ int timeoutInSeconds = 5;
TimerHandle handle = remoteObj.createTimer(timeoutInSeconds * 1000);
System.out.println("Waiting for message");
- boolean gotTimeout = tsr.waitForTimeout(timeoutInSeconds * 2);
+ boolean gotTimeout = tsr.waitForTimeout(timeoutInSeconds * 2);
- // @@@
- System.out.println("TimerSession : jndi lookup for -> " +
+ // @@@
+ System.out.println("TimerSession : jndi lookup for -> " +
jndiName + " <- test passed!!");
-
+
stat.addStatus("sessiontimer " + jndiName, stat.PASS);
} catch(Exception e) {
System.out.println("TimerSession : " + jndiName + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/application-client.xml
index 9fcb2a3..54a4bfb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/application-client.xml
@@ -32,5 +32,5 @@
<remote>com.sun.s1asdev.ejb.timer.sessiontimer.TimerSingletonRemote</remote>
<ejb-link>TimerSingleton</ejb-link>
</ejb-ref>
-
+
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java
index 0ea8635..b878e40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java
@@ -20,6 +20,6 @@
import java.rmi.RemoteException;
public interface TimerSession extends EJBObject {
- public TimerHandle createTimer(int ms) throws RemoteException;
+ public TimerHandle createTimer(int ms) throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
index 3262ecb..6d05ef7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
@@ -26,26 +26,26 @@
import java.rmi.RemoteException;
import javax.naming.*;
-public class TimerSessionEJB implements TimedObject, SessionBean
+public class TimerSessionEJB implements TimedObject, SessionBean
{
- private SessionContext context;
+ private SessionContext context;
private TimerSingleton singleton;
- public void ejbCreate() throws RemoteException {
-
- singleton = (TimerSingleton)
- context.lookup("java:module/TimerSingleton!com.sun.s1asdev.ejb.timer.sessiontimer.TimerSingleton");
+ public void ejbCreate() throws RemoteException {
- }
+ singleton = (TimerSingleton)
+ context.lookup("java:module/TimerSingleton!com.sun.s1asdev.ejb.timer.sessiontimer.TimerSingleton");
- public void ejbRemove() throws RemoteException {}
+ }
- public void setSessionContext(SessionContext sc) {
- context = sc;
- }
+ public void ejbRemove() throws RemoteException {}
- // business method to create a timer
- public TimerHandle createTimer(int ms) {
+ public void setSessionContext(SessionContext sc) {
+ context = sc;
+ }
+
+ // business method to create a timer
+ public TimerHandle createTimer(int ms) {
try {
System.out.println("Calling getMessageContext");
@@ -54,13 +54,13 @@
System.out.println("getMessageContext() successfully threw illegalStateException");
}
- TimerService timerService = context.getTimerService();
- Timer timer = timerService.createTimer(ms, "created timer");
- return timer.getHandle();
- }
+ TimerService timerService = context.getTimerService();
+ Timer timer = timerService.createTimer(ms, "created timer");
+ return timer.getHandle();
+ }
- // timer callback method
- public void ejbTimeout(Timer timer) {
+ // timer callback method
+ public void ejbTimeout(Timer timer) {
try {
System.out.println("Calling getMessageContext");
context.getMessageContext();
@@ -68,10 +68,10 @@
System.out.println("getMessageContext() successfully threw illegalStateException");
}
- singleton.setTimeoutReceived();
+ singleton.setTimeoutReceived();
- }
+ }
- public void ejbActivate() {}
- public void ejbPassivate() {}
+ public void ejbActivate() {}
+ public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java
index 14113b3..8943140 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java
@@ -21,5 +21,5 @@
import jakarta.ejb.CreateException;
public interface TimerSessionHome extends EJBHome {
- TimerSession create() throws CreateException, RemoteException;
+ TimerSession create() throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java
index b2e5d16..b9b3e6f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java
@@ -25,35 +25,35 @@
@Lock(LockType.READ)
public class TimerSingleton
{
-
+
boolean timeoutReceived = false;
public void startTest() {
- timeoutReceived = false;
+ timeoutReceived = false;
}
public void setTimeoutReceived() {
- System.out.println("TimerSingleton::setTimeoutReceived()");
- timeoutReceived = true;
+ System.out.println("TimerSingleton::setTimeoutReceived()");
+ timeoutReceived = true;
}
public boolean waitForTimeout(int seconds) {
- int i = 0;
- while(i < seconds) {
- i++;
- try {
- Thread.sleep(1000);
- if( timeoutReceived ) {
- System.out.println("Got timeout after " +
- i + " seconds");
- break;
- }
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e);
- }
- }
- return timeoutReceived;
+ int i = 0;
+ while(i < seconds) {
+ i++;
+ try {
+ Thread.sleep(1000);
+ if( timeoutReceived ) {
+ System.out.println("Got timeout after " +
+ i + " seconds");
+ break;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException(e);
+ }
+ }
+ return timeoutReceived;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java
index 4594dda..e467809 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java
@@ -22,7 +22,7 @@
public interface TimerSingletonRemote {
public void startTest();
-
+
public boolean waitForTimeout(int seconds);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.properties b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.properties
index 7feeb49..4c60348 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-sessiontimersecurity"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.xml
index aef59b2..90da12e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,14 +50,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -67,7 +67,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common,delete-user">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -84,10 +84,10 @@
<env key="VMARGS" value="-Dj2eelogin.name=principalName -Dj2eelogin.password=principalName" />
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="create-user">
<antcall target="create-user-common">
@@ -97,14 +97,14 @@
</antcall>
<antcall target="reconfig-common"/>
</target>
-
+
<target name="delete-user">
<!-- remove test users, just cleanup. -->
<antcall target="delete-user-common">
<param name="user" value="principalName"/>
</antcall>
</target>
-
+
<target name="restart">
<antcall target="restart-server-instance-common"/>
</target>
@@ -114,7 +114,7 @@
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
index 9edcdf0..2c93f34 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
@@ -29,9 +29,9 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
-
- private static SimpleReporterAdapter stat =
+
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
String jndiName = "ejb/ejb_timer_sessiontimersecurity_TimerSession";
@@ -55,24 +55,24 @@
public String doTest() {
String result = kTestPassed;
- QueueConnection connection = null;
+ QueueConnection connection = null;
TimerSession remoteObj = null;
String ejbName = "ejbs/Timer";
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref " + ejbName);
System.out.println("Doing timer test for " + jndiName);
java.lang.Object objref = ic.lookup("java:comp/env/" + ejbName);
- System.out.println("---ejb stub---" +
+ System.out.println("---ejb stub---" +
objref.getClass().getClassLoader());
- System.out.println("---ejb classname---" +
+ System.out.println("---ejb classname---" +
objref.getClass().getName());
- System.out.println("---TimerSessionHome---" +
+ System.out.println("---TimerSessionHome---" +
TimerSessionHome.class.getClassLoader());
System.err.println("Looked up home!!");
@@ -80,11 +80,11 @@
TimerSessionHome home = (TimerSessionHome)
PortableRemoteObject.narrow(objref, TimerSessionHome.class);
-
+
remoteObj = home.create();
- remoteObj.dummyBusinessMethod();
+ remoteObj.dummyBusinessMethod();
TimerHandle handle = remoteObj.createTimer(5000);
-
+
QueueConnectionFactory qcFactory = (QueueConnectionFactory)
ic.lookup("jms/ejb_timer_sessiontimersecurity_TQCF");
System.out.println (" qcFactory = " + qcFactory);
@@ -93,7 +93,7 @@
System.out.println (" queue = " + queue);
connection = qcFactory.createQueueConnection();
- QueueSession session =
+ QueueSession session =
connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
QueueReceiver receiver = session.createReceiver(queue);
connection.start();
@@ -101,14 +101,14 @@
Message message = receiver.receive(45000);
TextMessage textMsg = (TextMessage)message;
- if ( (message == null) ||
+ if ( (message == null) ||
(! textMsg.getText().equals("ejbTimeout() invoked")))
- throw new Exception("Received a null message ... TimeOut failed!!");
- System.out.println("Message : " + message);
-
- System.out.println("TimerSession : jndi lookup for -> " +
+ throw new Exception("Received a null message ... TimeOut failed!!");
+ System.out.println("Message : " + message);
+
+ System.out.println("TimerSession : jndi lookup for -> " +
jndiName + " <- test passed!!");
-
+
stat.addStatus("sessiontimersecurity " + jndiName, stat.PASS);
} catch(Exception e) {
System.out.println("TimerSession : " + jndiName + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java
index acfc21a..95c48f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java
@@ -20,8 +20,8 @@
import java.rmi.RemoteException;
public interface TimerSession extends EJBObject {
- public TimerHandle createTimer(int ms) throws RemoteException;
+ public TimerHandle createTimer(int ms) throws RemoteException;
- public void dummyBusinessMethod() throws RemoteException;
+ public void dummyBusinessMethod() throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
index e205ecc..cb1f970 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
@@ -33,42 +33,42 @@
import jakarta.jms.TextMessage;
import javax.naming.*;
-public class TimerSessionEJB implements TimedObject, SessionBean
+public class TimerSessionEJB implements TimedObject, SessionBean
{
- private SessionContext context;
- private QueueConnection connection;
- private QueueSession session;
- private Queue queue;
- private QueueSender sender;
+ private SessionContext context;
+ private QueueConnection connection;
+ private QueueSession session;
+ private Queue queue;
+ private QueueSender sender;
- public void ejbCreate() throws RemoteException {}
+ public void ejbCreate() throws RemoteException {}
- public void ejbRemove() throws RemoteException {}
+ public void ejbRemove() throws RemoteException {}
- public void setSessionContext(SessionContext sc) {
- context = sc;
- }
+ public void setSessionContext(SessionContext sc) {
+ context = sc;
+ }
- // business method to create a timer
+ // business method to create a timer
public void dummyBusinessMethod() {
try {
- System.out.println("dummyBusinessMethod(): getCallerPrincipal() = "
+ System.out.println("dummyBusinessMethod(): getCallerPrincipal() = "
+ context.getCallerPrincipal());
- System.out.println("dummyBusinessMethod(): isCallerInRole(foo) = "
+ System.out.println("dummyBusinessMethod(): isCallerInRole(foo) = "
+ context.isCallerInRole("foo"));
} catch(IllegalStateException ise) {
System.out.println(
- "dummyBusinessMethod(): isCallerInRole should not throw "
+ "dummyBusinessMethod(): isCallerInRole should not throw "
+ "illegalstateexception in business method");
throw ise;
}
}
- public TimerHandle createTimer(int ms) {
+ public TimerHandle createTimer(int ms) {
System.out.println("Calling createTimer");
- System.out.println("createTimer(): getCallerPrincipal() = "
+ System.out.println("createTimer(): getCallerPrincipal() = "
+ context.getCallerPrincipal());
- System.out.println("createTimer(): isCallerInRole(foo) = "
+ System.out.println("createTimer(): isCallerInRole(foo) = "
+ context.isCallerInRole("foo"));
try {
System.out.println("Calling isCallerInRole");
@@ -78,7 +78,7 @@
throw new Exception("isCallerInRole() should not fail in a business method");
}
} catch(IllegalStateException ise) {
- System.out.println("isCallerInRole should not throw "
+ System.out.println("isCallerInRole should not throw "
+ "illegalstateexception in business method");
throw ise;
} catch(Exception ise) {
@@ -93,22 +93,22 @@
}
- TimerService timerService = context.getTimerService();
- Timer timer = timerService.createTimer(ms, "created timer");
- return timer.getHandle();
- }
+ TimerService timerService = context.getTimerService();
+ Timer timer = timerService.createTimer(ms, "created timer");
+ return timer.getHandle();
+ }
- // timer callback method
- public void ejbTimeout(Timer timer) {
+ // timer callback method
+ public void ejbTimeout(Timer timer) {
try {
System.out.println("Calling ejbTimeout");
java.security.Principal principal = context.getCallerPrincipal();
- System.out.println("In ejbTimeout(): getCallerPrincipal(), principal - "
+ System.out.println("In ejbTimeout(): getCallerPrincipal(), principal - "
+ principal);
- System.out.println("In ejbTimeout(): isCallerInRole(foo), result - "
+ System.out.println("In ejbTimeout(): isCallerInRole(foo), result - "
+ context.isCallerInRole("foo"));
} catch(IllegalStateException ise) {
- System.out.println("ejbTimeout(): getCallerPrincipal() failed by "
+ System.out.println("ejbTimeout(): getCallerPrincipal() failed by "
+ "throwing IllegalStateException");
}
try {
@@ -119,7 +119,7 @@
System.out.println("ejbTimeout(): isCallerInRole() failed" );
}
} catch(IllegalStateException ise) {
- System.out.println("ejbTimeout(): isCallerInRole() failed by "
+ System.out.println("ejbTimeout(): isCallerInRole() failed by "
+ "throwing IllegalStateException");
}
@@ -127,46 +127,46 @@
System.out.println("Calling getMessageContext");
context.getMessageContext();
} catch(IllegalStateException ise) {
- System.out.println("ejbTimeout(): getMessageContext() successfully "
+ System.out.println("ejbTimeout(): getMessageContext() successfully "
+ "threw IllegalStateException");
}
- // add message to queue
- try {
+ // add message to queue
+ try {
- InitialContext ic = new InitialContext();
- QueueConnectionFactory qcFactory = (QueueConnectionFactory)
- ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
- Queue queue = (Queue) ic.lookup("java:comp/env/jms/MyQueue");
- connection = qcFactory.createQueueConnection();
+ InitialContext ic = new InitialContext();
+ QueueConnectionFactory qcFactory = (QueueConnectionFactory)
+ ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
+ Queue queue = (Queue) ic.lookup("java:comp/env/jms/MyQueue");
+ connection = qcFactory.createQueueConnection();
- QueueSession session = connection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
- sender = session.createSender(queue);
+ QueueSession session = connection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
+ sender = session.createSender(queue);
- TextMessage message = session.createTextMessage();
- message.setText("ejbTimeout() invoked");
- System.out.println("Sending time out message");
- sender.send(message);
- System.out.println("Time out message sent");
- } catch(NamingException e) {
- e.printStackTrace();
- } catch(JMSException e) {
- e.printStackTrace();
- }
- finally {
- try {
- if(connection != null) {
- connection.close();
+ TextMessage message = session.createTextMessage();
+ message.setText("ejbTimeout() invoked");
+ System.out.println("Sending time out message");
+ sender.send(message);
+ System.out.println("Time out message sent");
+ } catch(NamingException e) {
+ e.printStackTrace();
+ } catch(JMSException e) {
+ e.printStackTrace();
+ }
+ finally {
+ try {
+ if(connection != null) {
+ connection.close();
connection = null;
- }
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
- }
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
- public void ejbActivate() {}
- public void ejbPassivate() {}
+ public void ejbActivate() {}
+ public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java
index c5ddff3..9523096 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java
@@ -21,5 +21,5 @@
import jakarta.ejb.CreateException;
public interface TimerSessionHome extends EJBHome {
- TimerSession create() throws CreateException, RemoteException;
+ TimerSession create() throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.properties b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.properties
index e00b246..809bb62 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-timerserialization-sessiontimer"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.xml
index 7b01592..4f87569 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,14 +48,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -67,7 +67,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -79,14 +79,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
index e0c183d..9a991d4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_TIMERS = 60;
@@ -50,11 +50,11 @@
client.doTest();
System.out.println("[TimerSerializationClinet] DONE doTest()...");
stat.printSummary("timerserialization");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
initSFSBList(); //create MAX_TIMERS
@@ -172,7 +172,7 @@
TimerSFSB sfsb = (TimerSFSB) sfsbList.get(i);
String timerName = sfsb.getName();
System.out.println("Accessing Timer bean for: " + timerName);
- sfsb.cancelTimer();
+ sfsb.cancelTimer();
System.out.println("Successfully accessed Timer bean for: " + timerName);
stat.addStatus("ejbclient cancelTimers", stat.PASS);
@@ -185,4 +185,4 @@
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java
index a6f5a5b..ff53100 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java
@@ -23,19 +23,19 @@
extends EJBObject
{
- public void createTimer(int ms)
+ public void createTimer(int ms)
throws RemoteException;
- public String getName()
+ public String getName()
throws RemoteException;
- public long getTimeRemaining()
+ public long getTimeRemaining()
throws RemoteException;
- public TimerHandle getTimerHandle()
+ public TimerHandle getTimerHandle()
throws RemoteException;
- public void cancelTimer()
+ public void cancelTimer()
throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java
index 4a1ad6b..8c8ac66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java
@@ -31,14 +31,14 @@
import java.rmi.RemoteException;
public class TimerSFSBEJB
- implements SessionBean
+ implements SessionBean
{
- private SessionContext context;
+ private SessionContext context;
private String timerName;
private Context initialCtx;
private Timer timer;
- public void ejbCreate(String timerName) {
+ public void ejbCreate(String timerName) {
this.timerName = timerName;
}
@@ -46,31 +46,31 @@
return this.timerName;
}
- public void setSessionContext(SessionContext sc) {
- this.context = sc;
+ public void setSessionContext(SessionContext sc) {
+ this.context = sc;
try {
this.initialCtx = new InitialContext();
} catch (Throwable th) {
th.printStackTrace();
}
- }
+ }
- // business method to create a timer
- public void createTimer(int ms)
+ // business method to create a timer
+ public void createTimer(int ms)
throws RemoteException
{
try {
InitialContext initialCtx = new InitialContext();
TimerSLSBHome home = (TimerSLSBHome) initialCtx.lookup("java:comp/env/ejb/TimerSLSB");
- TimerSLSB slsb = (TimerSLSB) home.create();
- timer = slsb.createTimer(ms);
+ TimerSLSB slsb = (TimerSLSB) home.create();
+ timer = slsb.createTimer(ms);
System.out.println ("PG-> after createTimer()");
} catch (Exception ex) {
throw new RemoteException("Exception during TimerSFSBEJB::createTimer", ex);
}
- }
+ }
- public long getTimeRemaining() {
+ public long getTimeRemaining() {
long timeRemaining = -1;
try {
timeRemaining = timer.getTimeRemaining();
@@ -80,7 +80,7 @@
return timeRemaining;
}
- public TimerHandle getTimerHandle() {
+ public TimerHandle getTimerHandle() {
TimerHandle handle = null;
try {
handle = timer.getHandle();
@@ -90,7 +90,7 @@
return handle;
}
- public void cancelTimer() {
+ public void cancelTimer() {
try {
timer.cancel();
} catch(NoSuchObjectLocalException nsole) {
@@ -99,13 +99,13 @@
}
- public void ejbRemove() {}
+ public void ejbRemove() {}
- public void ejbActivate() {
+ public void ejbActivate() {
System.out.println ("In TimerSFSB.activate()");
}
- public void ejbPassivate() {
+ public void ejbPassivate() {
System.out.println ("In TimerSFSB.passivate()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java
index 9c6f951..f6c08cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java
@@ -23,6 +23,6 @@
public interface TimerSFSBHome
extends EJBHome
{
- public TimerSFSB create(String timerName)
+ public TimerSFSB create(String timerName)
throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java
index 4016262..3d40f15 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java
@@ -22,7 +22,7 @@
extends EJBLocalObject
{
- public Timer createTimer(int ms);
+ public Timer createTimer(int ms);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java
index de0c8c5..da54962 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java
@@ -24,35 +24,35 @@
import jakarta.ejb.SessionContext;
public class TimerSLSBEJB
- implements TimedObject, SessionBean
+ implements TimedObject, SessionBean
{
- private SessionContext context;
+ private SessionContext context;
- public void ejbCreate() {}
+ public void ejbCreate() {}
- public void setSessionContext(SessionContext sc) {
- context = sc;
- }
+ public void setSessionContext(SessionContext sc) {
+ context = sc;
+ }
- // business method to create a timer
- public Timer createTimer(int ms) {
- TimerService timerService = context.getTimerService();
- Timer timer = timerService.createTimer(ms, "created timer");
- return timer;
- }
+ // business method to create a timer
+ public Timer createTimer(int ms) {
+ TimerService timerService = context.getTimerService();
+ Timer timer = timerService.createTimer(ms, "created timer");
+ return timer;
+ }
- // timer callback method
- public void ejbTimeout(Timer timer) {
- System.out.println("TimerSLSB::ejbTimeout() invoked");
- }
-
- public void ejbRemove() {}
+ // timer callback method
+ public void ejbTimeout(Timer timer) {
+ System.out.println("TimerSLSB::ejbTimeout() invoked");
+ }
- public void ejbActivate() {
+ public void ejbRemove() {}
+
+ public void ejbActivate() {
System.out.println ("In TimerSLSB.activate()");
}
- public void ejbPassivate() {
+ public void ejbPassivate() {
System.out.println ("In TimerSLSB.passivate()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java
index c65e500..607c9da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java
@@ -22,6 +22,6 @@
public interface TimerSLSBHome
extends EJBLocalHome
{
- TimerSLSB create()
+ TimerSLSB create()
throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.properties b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.properties
index 65edb2a..14eb1e1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-timertests"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="dbschema" value="Bar.dbschema"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.xml
index 9c4116a..7a5ec5a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/TimerStuff*.class,**/AppInfo.class,**/Bar.class,**/BarHome.class,**/BarPrimaryKey.class,**/Foo.class,**/FooHome.class,**/Stateful.class,**/StatefulHome.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -73,14 +73,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
index 3157547..82cef32 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
@@ -48,10 +48,10 @@
private QueueSender queueSender;
*/
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- public static void main(String args[]) {
+ public static void main(String args[]) {
boolean doJms = false; // TODO (args.length == 1) && (args[0].equalsIgnoreCase("jms"));
stat.addDescription("ejb-timer-timertests");
@@ -63,18 +63,18 @@
TimerStuff foo = new Client().doFooTest("ejbs/Foo_BMT", doJms);
- /** TODO
+ /** TODO
new Client().doMessageDrivenTest("jms/TimerMDBQueue_CMT", foo, doJms);
new Client().doMessageDrivenTest("jms/TimerMDBQueue_BMT", foo, doJms);
- **/
+ **/
- new Client().doStatefulTest("ejbs/Stateful_CMT", foo,doJms);
- new Client().doStatefulTest("ejbs/Stateful_BMT", foo, doJms);
+ new Client().doStatefulTest("ejbs/Stateful_CMT", foo,doJms);
+ new Client().doStatefulTest("ejbs/Stateful_BMT", foo, doJms);
new Client().doBarTest("ejbtimer/Bar_CMT", doJms);
try {
- ((Foo) foo).remove();
+ ((Foo) foo).remove();
} catch(Exception e) {
e.printStackTrace();
}
@@ -95,16 +95,16 @@
public void doMessageDrivenTest(String jndiName, TimerStuff foo,
boolean jms) {
- /**
+ /**
if( jms ) { return; }
try {
System.out.println("********PG-> in doMessageDrivenTest() for jndiName = " + jndiName );
-
+
setup();
System.out.println("********PG-> in doMessageDrivenTest() after setup");
Context ic = new InitialContext();
- Queue messageDrivenDest = (Queue) ic.lookup("java:comp/env/" + jndiName);
+ Queue messageDrivenDest = (Queue) ic.lookup("java:comp/env/" + jndiName);
System.out.println("Doing message driven tests for" + jndiName);
@@ -122,7 +122,7 @@
long sleepTime = 30000;
System.out.println("Sleeping for " + sleepTime / 1000 + " seconds");
Thread.sleep(sleepTime);
-
+
// at this point, all foo timers should have been cancelled
// by the message bean.
foo.assertNoTimers();
@@ -136,12 +136,12 @@
} finally {
cleanup();
}
- **/
+ **/
}
public void doBarTest(String jndiName, boolean jms) {
try {
- Object barObjref = context.lookup(jndiName);
+ Object barObjref = context.lookup(jndiName);
System.out.println("doBarTest(): Doing bar timer test for " + jndiName);
@@ -168,7 +168,7 @@
System.out.println("doBarTest(): Bar after find " );
}
if (jms) {
- doJmsTest(bar);
+ doJmsTest(bar);
} else {
doTest(bar);
((EJBObject)bar).remove();
@@ -185,21 +185,21 @@
}
public void setup() throws Exception {
- /**
+ /**
//PG-> context = new InitialContext();
-
- TopicConnectionFactory topicConFactory =
+
+ TopicConnectionFactory topicConFactory =
(TopicConnectionFactory) context.lookup
("java:comp/env/jms/MyTopicConnectionFactory");
-
+
System.out.println("********PG-> setup(): after lookup");
topicCon = topicConFactory.createTopicConnection();
System.out.println("********PG-> setup(): after createTopicConnection");
- topicSession =
+ topicSession =
topicCon.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
System.out.println("********PG-> setup(): after createTopicSession");
-
+
// Producer will be specified when actual msg is published.
topicPublisher = topicSession.createPublisher(null);
System.out.println("********PG-> setup(): after createPublisher");
@@ -207,25 +207,25 @@
topicCon.start();
System.out.println("********PG-> setup(): after start");
- QueueConnectionFactory queueConFactory =
+ QueueConnectionFactory queueConFactory =
(QueueConnectionFactory) context.lookup
("java:comp/env/jms/MyQueueConnectionFactory");
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
queueCon.start();
- **/
+ **/
}
public void cleanup() {
- /**
+ /**
try {
if( topicCon != null ) {
topicCon.close();
@@ -239,7 +239,7 @@
**/
}
/**
- public void publishMsgs(Topic topic, Message msg, int num)
+ public void publishMsgs(Topic topic, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
System.out.println("Publishing message " + i + " to " + topic);
@@ -247,7 +247,7 @@
}
}
- public void sendMsgs(Queue queue, Message msg, int num)
+ public void sendMsgs(Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
System.out.println("Publishing message " + i + " to " + queue);
@@ -327,37 +327,37 @@
System.out.println("doTest(): creating the timerhandle");
TimerHandle timerHandle = timerStuff.createTimer(1, 1);
-
+
//
System.out.println("doTest(): creating the timerhandle2");
TimerHandle timerHandle2 = timerStuff.createTimer(10000, 10000);
-
+
//
System.out.println("doTest(): creating the timerhandle3");
TimerHandle timerHandle3 = timerStuff.createTimer(new Date());
-
+
//
System.out.println("doTest(): creating the timerhandle4");
TimerHandle timerHandle4 = timerStuff.createTimer(new Date(new Date().getTime() + 2000));
-
+
//
System.out.println("doTest(): creating the timerhandle5");
TimerHandle timerHandle5 = timerStuff.createTimer(new Date(new Date().getTime() + 20000), 10000);
System.out.println("doTest(): creating the createTimerAndRollback");
timerStuff.createTimerAndRollback(20000);
-
+
//
System.out.println("doTest(): creating the createTimerAndCancel");
timerStuff.createTimerAndCancel(20000);
-
+
// @@@ reevaluate double cancel logic
//timerStuff.createTimerAndCancelAndCancel(20000);
-
+
//
System.out.println("doTest(): creating the createTimerAndCancelAndRollback");
timerStuff.createTimerAndCancelAndRollback(20000);
-
+
//
System.out.println("doTest(): creating the cancelTimer(timerhandle2)");
timerStuff.cancelTimer(timerHandle2);
@@ -368,18 +368,18 @@
timerStuff.cancelTimerAndRollback(timerHandle5);
// @@@ reevaluate double cancel logic
//timerStuff.cancelTimerAndCancelAndRollback(timerHandle6);
-
- TimerHandle timerHandle7 =
+
+ TimerHandle timerHandle7 =
timerStuff.createTimer(1, 1, "cancelTimer");
- TimerHandle timerHandle8 =
+ TimerHandle timerHandle8 =
timerStuff.createTimer(1, 1, "cancelTimerAndRollback");
- TimerHandle timerHandle9 =
+ TimerHandle timerHandle9 =
timerStuff.createTimer(1, "cancelTimerAndRollback");
TimerHandle timerHandle11 = timerStuff.getTimeRemainingTest1(20);
timerStuff.getTimeRemainingTest2(20, timerHandle11);
timerStuff.getTimeRemainingTest2(20, timerHandle);
-
+
TimerHandle timerHandle12 = timerStuff.getNextTimeoutTest1(20);
timerStuff.getNextTimeoutTest2(20, timerHandle12);
timerStuff.getNextTimeoutTest2(20, timerHandle);
@@ -430,7 +430,7 @@
}
- public void doEntityTests(BarHome barHome)
+ public void doEntityTests(BarHome barHome)
throws Exception {
TimerStuff bar1 = barHome.create(new Long(1), "1");
TimerHandle timerHandle1 = bar1.createTimer(100000000);
@@ -454,7 +454,7 @@
info = bar5.getInfo(timerHandle5);
System.out.println("Info = " + info);
barHome.remove(((EJBObject)bar5).getPrimaryKey());
- // At this point timer should not exist since we removed its
+ // At this point timer should not exist since we removed its
// timed object
try {
info = bar5.getInfoNoError(timerHandle5);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml
index 1ba18ae..bd61580 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml
@@ -67,14 +67,14 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/TimerMDBQueue_CMT</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
<message-destination-usage>Produces</message-destination-usage>
<message-destination-link>TimerMDBQueue_CMT</message-destination-link>
</message-destination-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/TimerMDBQueue_BMT</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
index 6f00dd0..eb5bdf8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
@@ -85,7 +85,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -112,7 +112,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -141,7 +141,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -173,7 +173,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -205,7 +205,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -237,7 +237,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -269,7 +269,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/AppInfo.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/AppInfo.java
index dd1c356..0baf70f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/AppInfo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/AppInfo.java
@@ -28,6 +28,6 @@
public String toString()
{
- return foo;
+ return foo;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java
index 897bb0a..b657ca7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java
@@ -20,5 +20,5 @@
import jakarta.ejb.*;
public interface Bar extends EJBObject, TimerStuff {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java
index 48c3cf6..ef915c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java
@@ -19,9 +19,9 @@
import java.rmi.RemoteException;
import jakarta.ejb.*;
-public abstract class BarEJB
- extends TimerStuffImpl
- implements EntityBean, TimedObject
+public abstract class BarEJB
+ extends TimerStuffImpl
+ implements EntityBean, TimedObject
{
private EJBContext context_;
@@ -32,7 +32,7 @@
// primary key
- public abstract Long getId();
+ public abstract Long getId();
public abstract void setId(Long timerId);
public abstract String getValue2();
@@ -66,7 +66,7 @@
}
- public BarPrimaryKey ejbCreate(Long id, String value2)
+ public BarPrimaryKey ejbCreate(Long id, String value2)
throws CreateException {
String methodName = "ejbCreate";
System.out.println("In BarEJB::ejbCreate");
@@ -80,7 +80,7 @@
return new BarPrimaryKey(id, value2);
}
- public BarPrimaryKey ejbCreateWithTimer(Long id, String value2)
+ public BarPrimaryKey ejbCreateWithTimer(Long id, String value2)
throws CreateException {
String methodName = "ejbCreateWithTimer";
System.out.println("In BarEJB::ejbCreateWithTimer");
@@ -92,7 +92,7 @@
setValue2(value2);
return new BarPrimaryKey(id, value2);
}
-
+
public void ejbPostCreate(Long id, String value2) throws CreateException {
String methodName = "ejbPostCreate";
System.out.println("In BarEJB::ejbPostCreate");
@@ -113,7 +113,7 @@
TimerService timerService = context_.getTimerService();
Timer timer = timerService.createTimer
(1, 1, methodName + id);
-
+
} catch(Exception e) {
e.printStackTrace();
throw new CreateException(e.getMessage());
@@ -139,7 +139,7 @@
context_ = null;
}
- public void ejbHomeNewTimerAndRemoveBean(Long id, String value2)
+ public void ejbHomeNewTimerAndRemoveBean(Long id, String value2)
throws RemoteException {
String methodName = "ejbHomeNewTimerAndRemoveBean";
checkCallerSecurityAccess(methodName, true);
@@ -155,7 +155,7 @@
}
}
- public void ejbHomeNewTimerAndRemoveBeanAndRollback(Long id, String value2)
+ public void ejbHomeNewTimerAndRemoveBeanAndRollback(Long id, String value2)
throws RemoteException {
getTimerService("ejbHomeNewTimerAndRemoveBeanAndRollback", true);
doTimerStuff("ejbHomeNewTimerAndRemoveBeanAndRollback", false);
@@ -170,7 +170,7 @@
}
}
- public void ejbHomeNixBeanAndRollback(Bar b)
+ public void ejbHomeNixBeanAndRollback(Bar b)
throws RemoteException {
getTimerService("ejbHomeNixBeanAndRollback", true);
doTimerStuff("ejbHomeNixBeanAndRollback", false);
@@ -192,7 +192,7 @@
doTimerStuff(methodName, true);
cleanup();
}
-
+
public void ejbLoad() {
String methodName = "ejbLoad";
System.out.println("In BarEJB::ejbLoad");
@@ -201,7 +201,7 @@
getTimerService(methodName, true);
doTimerStuff(methodName, true);
}
-
+
public void ejbStore() {
String methodName = "ejbStore";
System.out.println("In BarEJB::ejbStore");
@@ -210,7 +210,7 @@
getTimerService(methodName, true);
doTimerStuff(methodName, true);
}
-
+
public void ejbPassivate() {
String methodName = "ejbPassivate";
checkCallerSecurityAccess(methodName, false);
@@ -218,7 +218,7 @@
getTimerService(methodName, true);
doTimerStuff(methodName, false);
}
-
+
public void ejbActivate() {
String methodName = "ejbActivate";
checkCallerSecurityAccess(methodName, false);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java
index aeee37f..604c19b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java
@@ -21,12 +21,12 @@
public interface BarHome extends EJBHome {
- Bar create(Long value1, String value2)
+ Bar create(Long value1, String value2)
throws CreateException, RemoteException;
- Bar createWithTimer(Long value1, String value2)
+ Bar createWithTimer(Long value1, String value2)
throws CreateException, RemoteException;
Bar findByPrimaryKey(BarPrimaryKey bpk) throws FinderException, RemoteException;
-
+
void newTimerAndRemoveBean(Long value1, String value2) throws RemoteException;
void newTimerAndRemoveBeanAndRollback(Long value1, String value2) throws RemoteException;
void nixBeanAndRollback(Bar b) throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java
index 328c637..70b58c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java
@@ -34,21 +34,21 @@
public boolean equals(Object other)
{
- if ( other instanceof BarPrimaryKey ) {
+ if ( other instanceof BarPrimaryKey ) {
BarPrimaryKey bpk = (BarPrimaryKey) other;
- return ((id.equals(bpk.id))
+ return ((id.equals(bpk.id))
&& (value2.equals(bpk.value2)));
}
- return false;
+ return false;
}
public int hashCode()
{
- return id.hashCode();
+ return id.hashCode();
}
public String toString()
{
- return id + "_" + value2;
+ return id + "_" + value2;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java
index 7d0b388..4a57b11 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java
@@ -50,7 +50,7 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
setContext(sc);
System.out.println("In FooEJB::setSessionContext");
@@ -62,7 +62,7 @@
}
public void ejbCreate() throws RemoteException {
- System.out.println("In ejbtimer.Foo::ejbCreate !!");
+ System.out.println("In ejbtimer.Foo::ejbCreate !!");
setupJmsConnection();
checkGetSetRollbackOnly("ejbCreate", false);
checkCallerSecurityAccess("ejbCreate", false);
@@ -86,6 +86,6 @@
public void ejbPassivate() {
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
index 0cc8fcd..ce0c74c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
@@ -20,7 +20,7 @@
import jakarta.jms.*;
import jakarta.ejb.*;
-public class MessageDrivenEJB extends TimerStuffImpl
+public class MessageDrivenEJB extends TimerStuffImpl
implements MessageDrivenBean, TimedObject, MessageListener {
private MessageDrivenContext mdc;
@@ -38,7 +38,7 @@
System.out.println("Received message " + info + " , redelivered = " + redelivered);
if (info.equals("test1") ) {
- System.out.println("In onMessage : Got th for timer = " +
+ System.out.println("In onMessage : Got th for timer = " +
t.getInfo());
doTimerStuff("onMessage", true);
getInfo(th);
@@ -46,9 +46,9 @@
getTimeRemainingTest2(5, th);
cancelTimer(th);
-
+
createTimerAndCancel(10000000);
-
+
TimerHandle t1 = createTimer(1000000, "messagedrivenejb");
cancelTimer(t1);
TimerHandle t2 = createTimer(10000, "messagedrivenejb");
@@ -59,7 +59,7 @@
if( isBMT() ) {
cancelTimer(th);
} else {
- cancelTimerAndRollback(th);
+ cancelTimerAndRollback(th);
}
}
} else if( info.equals("test3") ) {
@@ -81,8 +81,8 @@
cancelTimer(th);
TimerHandle ctar = createTimer(1, 1, "cancelTimerAndRollback");
cancelTimer(ctar);
- }
-
+ }
+
} catch(Exception e) {
e.printStackTrace();
}
@@ -92,7 +92,7 @@
checkCallerSecurityAccess("ejbTimeout", false);
try {
- System.out.println("In MessageDrivenEJB::ejbTimeout --> "
+ System.out.println("In MessageDrivenEJB::ejbTimeout --> "
+ t.getInfo());
} catch(RuntimeException e) {
System.out.println("got exception while calling getInfo");
@@ -111,9 +111,9 @@
}
public void setMessageDrivenContext(MessageDrivenContext mdc) {
- this.mdc = mdc;
+ this.mdc = mdc;
setContext(mdc);
- System.out.println("In ejbtimer.MessageDrivenEJB::setMessageDrivenContext !!");
+ System.out.println("In ejbtimer.MessageDrivenEJB::setMessageDrivenContext !!");
checkCallerSecurityAccess("setMessageDrivenContext", false);
getTimerService("setMessageDrivenContext", false);
@@ -121,7 +121,7 @@
}
public void ejbCreate() throws RemoteException {
- System.out.println("In ejbtimer.MessageDrivenEJB::ejbCreate !!");
+ System.out.println("In ejbtimer.MessageDrivenEJB::ejbCreate !!");
setupJmsConnection();
checkGetSetRollbackOnly("ejbCreate", false);
checkCallerSecurityAccess("ejbCreate", false);
@@ -130,7 +130,7 @@
}
public void ejbRemove() {
- System.out.println("In ejbtimer.MessageDrivenEJB::ejbRemove !!");
+ System.out.println("In ejbtimer.MessageDrivenEJB::ejbRemove !!");
checkCallerSecurityAccess("ejbRemove", false);
checkGetSetRollbackOnly("ejbRemove", false);
getTimerService("ejbRemove", true);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java
index efc9927..a55498c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java
@@ -29,7 +29,7 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
setContext(sc);
checkCallerSecurityAccess("setSessionContext", false);
@@ -37,7 +37,7 @@
}
public void ejbCreate(TimerHandle th) throws RemoteException {
- System.out.println("In ejbtimer.Stateful::ejbCreate !!");
+ System.out.println("In ejbtimer.Stateful::ejbCreate !!");
timerHandle = th;
@@ -68,8 +68,8 @@
public void ejbPassivate() {
}
- public void afterBegin() {
- System.out.println("in afterBegin");
+ public void afterBegin() {
+ System.out.println("in afterBegin");
try {
Timer t = timerHandle.getTimer();
t.getInfo();
@@ -82,7 +82,7 @@
}
public void beforeCompletion() {
- System.out.println("in beforeCompletion");
+ System.out.println("in beforeCompletion");
try {
Timer t = timerHandle.getTimer();
} catch(NoSuchObjectLocalException nsole) {
@@ -95,7 +95,7 @@
}
public void afterCompletion(boolean committed) {
- System.out.println("in afterCompletion. committed = " + committed);
+ System.out.println("in afterCompletion. committed = " + committed);
try {
Timer t = timerHandle.getTimer();
System.out.println("Error : should have gotten exception in " +
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java
index 3df0cba..47055c6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java
@@ -66,10 +66,10 @@
void assertTimerNotActive(TimerHandle handle) throws RemoteException;
void sendMessageAndCreateTimer() throws RemoteException, Exception;
- void recvMessageAndCreateTimer(boolean expectMessage)
+ void recvMessageAndCreateTimer(boolean expectMessage)
throws RemoteException, Exception;
- void sendMessageAndCreateTimerAndRollback()
+ void sendMessageAndCreateTimerAndRollback()
throws RemoteException, Exception;
- void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
+ void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
throws RemoteException, Exception;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
index e496337..30465cf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
@@ -34,14 +34,14 @@
import jakarta.jms.TextMessage;
public class TimerStuffImpl implements TimerStuff {
-
+
private static final int TX_CMT = 0;
private static final int TX_BMT = 1;
private static final int TX_UNSPECIFIED = 2;
-
+
private EJBContext context_;
private int txMode = TX_CMT;
-
+
private Queue queue;
private QueueSession session;
private QueueConnection connection;
@@ -61,12 +61,12 @@
} else {
txMode = TX_UNSPECIFIED;
}
- /** TODO
+ /** TODO
queue = (Queue) ic.lookup("java:comp/env/jms/MyQueue");
- qcFactory = (QueueConnectionFactory)
+ qcFactory = (QueueConnectionFactory)
ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
- **/
+ **/
} catch(Exception e) {
e.printStackTrace();
@@ -76,7 +76,7 @@
protected boolean isCMT() { return txMode == TX_CMT; }
protected boolean isBMT() { return txMode == TX_BMT; }
protected boolean isTxUnspecified() { return txMode == TX_UNSPECIFIED; }
-
+
public TimerHandle createTimer(long duration, String info) throws RemoteException, Exception {
TimerService ts = context_.getTimerService();
Timer t = ts.createTimer(duration, info);
@@ -87,30 +87,30 @@
return createTimer(duration, "createTimer<long>" + duration);
}
- public TimerHandle createTimer(long initialDuration, long interval)
+ public TimerHandle createTimer(long initialDuration, long interval)
throws RemoteException, Exception {
- return createTimer(initialDuration, interval,
+ return createTimer(initialDuration, interval,
"createTimer<long, long>" + initialDuration +
"," + interval);
}
- public TimerHandle createTimer(long initialDuration, long interval,
- String info)
+ public TimerHandle createTimer(long initialDuration, long interval,
+ String info)
throws RemoteException, Exception {
if( isBMT() ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createTimer(initialDuration, interval,
+ Timer t = ts.createTimer(initialDuration, interval,
new AppInfo(info));
-
+
if( isBMT() ) {
context_.getUserTransaction().commit();
}
return t.getHandle();
}
- public TimerHandle createTimer(Date expirationTime)
+ public TimerHandle createTimer(Date expirationTime)
throws RemoteException, Exception {
TimerService ts = context_.getTimerService();
if( isBMT() ) {
@@ -129,7 +129,7 @@
return t.getHandle();
}
- public TimerHandle createTimer(Date expirationTime, long interval)
+ public TimerHandle createTimer(Date expirationTime, long interval)
throws RemoteException, Exception {
if( isBMT() ) {
@@ -174,12 +174,12 @@
public void createTimerAndCancelAndCancel(long duration) throws RemoteException, Exception {
if( isTxUnspecified() ) {
- return;
+ return;
} else if( isBMT() ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createTimer(duration, "createTimerAndCancelAndCancel"
+ Timer t = ts.createTimer(duration, "createTimerAndCancelAndCancel"
+ duration);
t.cancel();
t.cancel();
@@ -188,7 +188,7 @@
}
}
- public void createTimerAndCancelAndRollback(long duration)
+ public void createTimerAndCancelAndRollback(long duration)
throws RemoteException, Exception {
if( isTxUnspecified() ) {
return;
@@ -196,7 +196,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createTimer(duration, "createTimerAndCancelAndRollback"
+ Timer t = ts.createTimer(duration, "createTimerAndCancelAndRollback"
+ duration);
t.cancel();
if( isBMT() ) {
@@ -243,8 +243,8 @@
context_.getUserTransaction().commit();
}
}
-
- public void cancelTimerAndRollback(TimerHandle timerHandle)
+
+ public void cancelTimerAndRollback(TimerHandle timerHandle)
throws RemoteException, Exception {
if( isTxUnspecified() ) {
return;
@@ -260,7 +260,7 @@
}
}
- public void cancelTimerAndCancelAndRollback(TimerHandle timerHandle)
+ public void cancelTimerAndCancelAndRollback(TimerHandle timerHandle)
throws RemoteException, Exception {
if( isTxUnspecified() ) {
return;
@@ -311,7 +311,7 @@
// success
} else {
throw new RemoteException("getTimers failure");
- }
+ }
}
public TimerHandle getTimeRemainingTest1(int numIterations) throws RemoteException, Exception {
@@ -372,7 +372,7 @@
}
}
- // Make sure there are no active timers.
+ // Make sure there are no active timers.
public void assertNoTimers() throws RemoteException, Exception {
checkCallerSecurityAccess("assertNoTimers", true);
TimerService ts = context_.getTimerService();
@@ -382,11 +382,11 @@
}
}
- public void assertTimerNotActive(TimerHandle timerHandle)
+ public void assertTimerNotActive(TimerHandle timerHandle)
throws RemoteException {
try {
Timer t = timerHandle.getTimer();
- throw
+ throw
new Exception("assertTimerNotActive called with active timer");
} catch(NoSuchObjectLocalException nsole) {
// caught expected exception
@@ -395,10 +395,10 @@
}
}
- public Serializable getInfoNoError(TimerHandle timerHandle)
+ public Serializable getInfoNoError(TimerHandle timerHandle)
throws Exception {
return getInfo(timerHandle, false);
-
+
}
public Serializable getInfo(TimerHandle timerHandle) throws Exception {
@@ -449,18 +449,18 @@
return;
}
- public void recvMessageAndCreateTimer(boolean expectMessage)
+ public void recvMessageAndCreateTimer(boolean expectMessage)
throws RemoteException, Exception {
if( isTxUnspecified() ) {
return;
}
try {
-
+
if( isBMT() ) {
context_.getUserTransaction().begin();
}
- recvMessageAndCreateTimer("recvMessageAndCreateTimer",
+ recvMessageAndCreateTimer("recvMessageAndCreateTimer",
expectMessage);
} catch(Exception e) {
@@ -474,7 +474,7 @@
return;
}
- public void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
+ public void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
throws RemoteException, Exception {
if( isTxUnspecified() ) {
@@ -515,7 +515,7 @@
TimerHandle th = t.getHandle();
} catch(Exception e) {
throw e;
- }
+ }
return;
}
@@ -526,11 +526,11 @@
QueueReceiver receiver = session.createReceiver(queue);
// Send a message.
TextMessage message = (TextMessage) receiver.receiveNoWait();
-
+
if( message == null ) {
if( expectMessage ) {
throw new RemoteException("Expecting message in " +
- "recvMessageAndCreateTimerAndRollback");
+ "recvMessageAndCreateTimerAndRollback");
}
} else {
if( !expectMessage ) {
@@ -538,13 +538,13 @@
message.getText());
}
}
-
+
TimerService ts = context_.getTimerService();
Timer t = ts.createTimer(1, timerName);
TimerHandle th = t.getHandle();
} catch(Exception e) {
throw e;
- }
+ }
return;
}
@@ -697,7 +697,7 @@
} else {
getTimerService("ejbTimeout", true);
doTimerStuff("ejbTimeout", true);
- }
+ }
}
protected void checkCallerSecurityAccess(String method, boolean allowed) {
@@ -739,19 +739,19 @@
protected void setupJmsConnection() {
- /** TODO
-
+ /** TODO
+
try {
InitialContext ic = new InitialContext();
connection = qcFactory.createQueueConnection();
session = connection.createQueueSession(true, 0);
connection.start();
} catch(Exception e) { e.printStackTrace(); }
- */
+ */
}
protected void cleanup() {
- /** TODO
+ /** TODO
if( connection != null ) {
try {
connection.close();
@@ -760,7 +760,7 @@
jmse.printStackTrace();
}
}
- **/
+ **/
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/build.xml b/appserver/tests/appserv-tests/devtests/ejb/txprop/build.xml
index e03d391..d3dadb4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-txprop tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-txprop tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.properties b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.properties
index 76f4fd8..a67c7ad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-txprop-cmttimeout"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.xml b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.xml
index 94d5df9..a53b29e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleSLSBHome.class,**/SimpleSLSB.class,**/SimpleEntityHome.class,**/SimpleEntity.class,**/*Client*.class,**/*Foo.class,**/*FooHome.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java
index a39e98a..0ffa3ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java
@@ -31,7 +31,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -40,27 +40,27 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-txprop-cmttimeout");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/SimpleSLSBHome");
System.out.println("objref = " + objref);
-
+
SimpleSLSBHome home = (SimpleSLSBHome)PortableRemoteObject.narrow
(objref, SimpleSLSBHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
SimpleSLSB f = home.create();
System.err.println("Got the EJB!!");
@@ -72,7 +72,7 @@
stat.addStatus("ejbclient main" , stat.FAIL);
}
}
-
+
private void doTest1(SimpleSLSB ref) {
try {
// invoke method on the EJB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java
index a9d12cc..1cd7318 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -36,11 +36,11 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public boolean invokeMethod(int timeout) {
@@ -49,14 +49,14 @@
boolean marked = sc.getRollbackOnly();
try {
Context ic = new InitialContext();
-
+
Object objref = ic.lookup("java:comp/env/ejb/hello");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
Hello hr = home.create();
-
+
marked = sc.getRollbackOnly();
System.out.println("Before invocation ctx.getRollbackOnly(): "
+ marked);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java
index 80a9db8..4bcbc71 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -31,11 +31,11 @@
public HelloBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In HelloBean::ejbCreate !!");
+ System.out.println("In HelloBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void compute(int timeout) {
@@ -51,7 +51,7 @@
+ "; time left = " + ((deadline - now) / 1000)
+ " seconds.");
sortArray(1024);
- try {Thread.sleep(10);} catch (Exception ex) {}
+ try {Thread.sleep(10);} catch (Exception ex) {}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java
index ccd911c..298c2a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java
@@ -56,8 +56,8 @@
Connection c = null;
PreparedStatement ps = null;
try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"INSERT INTO SimpleEntity (key, name) VALUES (?,?)");
ps.setString(1, key);
ps.setString(2, name);
@@ -68,7 +68,7 @@
this.name = name;
} catch (SQLException e) {
throw new CreateException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -94,10 +94,10 @@
throws FinderException
{
Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"SELECT key from SimpleEntity where key = ?");
ps.setString(1, key);
ResultSet rs = ps.executeQuery();
@@ -107,7 +107,7 @@
return key;
} catch (SQLException e) {
throw new FinderException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -125,65 +125,65 @@
ps = c.prepareStatement(
"SELECT name from SimpleEntity where key = ?");
ps.setString(1, key);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + key);
- this.name = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + key);
+ this.name = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE SimpleEntity SET name = ? WHERE key = ?");
- ps.setString(1, name);
- ps.setString(2, key);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE SimpleEntity SET name = ? WHERE key = ?");
+ ps.setString(1, name);
+ ps.setString(2, key);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM SimpleEntity WHERE key = ?");
- ps.setString(1, name);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM SimpleEntity WHERE key = ?");
+ ps.setString(1, name);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java
index 2717571..1e52686 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -34,11 +34,11 @@
}
public void ejbCreate() throws RemoteException {
- System.out.println("In SimpleSLSBHome::ejbCreate !!");
+ System.out.println("In SimpleSLSBHome::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public boolean doSomething(int timeout) {
@@ -51,7 +51,7 @@
long deadline = System.currentTimeMillis() + (timeout * 1000);
for (int n = 1; true; n = n << 1) {
long now = System.currentTimeMillis();
-
+
if (now > deadline) {
break;
}
@@ -60,7 +60,7 @@
+ "; time left = " + ((deadline - now) / 1000)
+ " seconds. result: " + result);
sortArray(1024);
- try {Thread.sleep(5 * 1000);} catch (Exception ex) {}
+ try {Thread.sleep(5 * 1000);} catch (Exception ex) {}
}
result = sc.getRollbackOnly();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.properties b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.properties
index 2cb9fe9..b2f077f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-txprop-simple"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.xml b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.xml
index 10dfb6d..a983c93 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo.class,**/*FooHome.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java
index 9eedeeb..8675077 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,31 +37,31 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-txprop-simpleID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/foo");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Foo f = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
f.callHello();
@@ -73,8 +73,8 @@
e.printStackTrace();
stat.addStatus("ejbclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java
index ef751dd..a699d26 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java
@@ -19,7 +19,7 @@
import java.util.Date;
import java.util.Collection;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -37,7 +37,7 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
// getting UserTransaction() is allowed
System.out.println("Calling getUserTransaction()");
@@ -56,7 +56,7 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void callHello() {
@@ -64,24 +64,24 @@
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("starting user tx");
-
+
sc.getUserTransaction().begin();
System.out.println("invoking ejb with user tx");
@@ -104,13 +104,13 @@
}
TimerService timerService = sc.getTimerService();
-
+
try {
timerService.createTimer(new Date(), 1000, null);
throw new EJBException("CreateTimer call should have failed.");
} catch(IllegalStateException ise) {
System.out.println("Successfully got illegal state exception " +
- "when attempting to create timer : " +
+ "when attempting to create timer : " +
ise.getMessage());
}
try {
@@ -118,7 +118,7 @@
throw new EJBException("CreateTimer call should have failed.");
} catch(IllegalStateException ise) {
System.out.println("Successfully got illegal state exception " +
- "when attempting to create timer : " +
+ "when attempting to create timer : " +
ise.getMessage());
}
try {
@@ -126,7 +126,7 @@
throw new EJBException("CreateTimer call should have failed.");
} catch(IllegalStateException ise) {
System.out.println("Successfully got illegal state exception " +
- "when attempting to create timer : " +
+ "when attempting to create timer : " +
ise.getMessage());
}
try {
@@ -134,26 +134,26 @@
throw new EJBException("CreateTimer call should have failed.");
} catch(IllegalStateException ise) {
System.out.println("Successfully got illegal state exception " +
- "when attempting to create timer : " +
+ "when attempting to create timer : " +
ise.getMessage());
}
Collection timers = timerService.getTimers();
if( timers.size() > 0 ) {
- throw new EJBException("Wrong number of timers : " +
+ throw new EJBException("Wrong number of timers : " +
timers.size());
} else {
System.out.println("Successfully retrieved 0 timers");
}
-
+
Package p = this.getClass().getPackage();
if( p == null ) {
- throw new EJBException("null package for " +
+ throw new EJBException("null package for " +
this.getClass().getName());
} else {
System.out.println("Package name = " + p);
}
-
+
}
public void ejbRemove() throws RemoteException {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java
index a2ebe78..3024d5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -31,11 +31,11 @@
public HelloBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In HelloBean::ejbCreate !!");
+ System.out.println("In HelloBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void sayHello() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/build.xml b/appserver/tests/appserv-tests/devtests/ejb/util/build.xml
index 6b73da1..64cbb84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/build.xml
@@ -39,10 +39,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
+ <echo>
+ Usage:
ant methodmap (Executes the ejb-util methodmap test)
ant all (Executes all the ejb-util tests)
- </echo>
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.properties b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.properties
index 0387b4e..0a3019a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="test.name" value="com.sun.s1asdev.ejb.util.methodmap"/>
<property name="simple.client" value="${test.name}.client.MethodMapTest"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml
index 3ca01b9..c2bc0d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="init-common">
<mkdir dir="${build.classes.dir}"/>
<echo message="common.xml: Compiling test source files" level="verbose"/>
@@ -42,27 +42,27 @@
destdir="${build.classes.dir}"
classpath="${s1astest.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
-
+
<target name="runclient" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
</java>
- </target>
+ </target>
<target name="perf" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${perf.client}">
<arg value="javax.xml.rpc.Service"/>
<arg value="100000"/>
</java>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
index c30a6ce..1461c57 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
@@ -27,21 +27,21 @@
public class MethodMapTest {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
private static final Class[] TEST_CLASSES = {
java.lang.Object.class,
- MethodMapTest1.class, MethodMapTest2.class, MethodMapTest3.class,
+ MethodMapTest1.class, MethodMapTest2.class, MethodMapTest3.class,
MethodMapTest4.class, MethodMapTest3.class, MethodMapTest6.class,
- MethodMapTest.class, jakarta.ejb.EJBHome.class,
+ MethodMapTest.class, jakarta.ejb.EJBHome.class,
jakarta.ejb.EJBObject.class, jakarta.ejb.EJBLocalObject.class,
jakarta.ejb.EJBLocalHome.class, jakarta.ejb.SessionBean.class,
jakarta.ejb.EnterpriseBean.class, java.util.Map.class,
jakarta.jms.QueueConnection.class, jakarta.jms.QueueSession.class,
jakarta.jms.Session.class, java.util.Date.class,
javax.swing.Action.class, javax.swing.AbstractAction.class,
- javax.swing.JComboBox.class, javax.swing.JTextArea.class
+ javax.swing.JComboBox.class, javax.swing.JTextArea.class
};
@@ -51,9 +51,9 @@
MethodMapTest test = new MethodMapTest(args);
test.doTest();
stat.printSummary("ejb-util-methodmapID");
- }
-
- public MethodMapTest (String[] args) {
+ }
+
+ public MethodMapTest (String[] args) {
}
public void doTest() {
@@ -63,17 +63,17 @@
System.out.println("Doing methodmap test for " + c);
boolean result = testClass(c);
if( result ) {
- stat.addStatus("methodmapclient main", stat.PASS);
+ stat.addStatus("methodmapclient main", stat.PASS);
} else {
- stat.addStatus("methodmapclient main", stat.FAIL);
+ stat.addStatus("methodmapclient main", stat.FAIL);
}
- }
-
+ }
+
testCtor();
testUnsupportedOperations();
-
-
+
+
}
private void testCtor() {
@@ -83,7 +83,7 @@
try {
new MethodMap(new HashMap(), -1);
System.out.println("bucketSize -1 should have thrown exception");
- } catch(IllegalArgumentException e) {
+ } catch(IllegalArgumentException e) {
ctorTest1Passed = true;
} catch(Exception e) {
e.printStackTrace();
@@ -107,23 +107,23 @@
ctorTest3Passed = true;
} catch(Exception e) {
e.printStackTrace();
- }
+ }
// pass map containing something other than Method objects
Map otherMap = new HashMap();
otherMap.put("foo", "bar");
boolean ctorTest4Passed = false;
try {
- new MethodMap(otherMap);
+ new MethodMap(otherMap);
} catch(Exception e) {
ctorTest4Passed = true;
}
- if( ctorTest1Passed && ctorTest2Passed & ctorTest3Passed
+ if( ctorTest1Passed && ctorTest2Passed & ctorTest3Passed
&& ctorTest4Passed ) {
- stat.addStatus("methodmapclient ctor", stat.PASS);
+ stat.addStatus("methodmapclient ctor", stat.PASS);
} else {
- stat.addStatus("methodmapclient ctor", stat.FAIL);
+ stat.addStatus("methodmapclient ctor", stat.FAIL);
}
}
@@ -157,7 +157,7 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
boolean uoeTest3Passed = false;
try {
methodMap.remove(method1);
@@ -176,19 +176,19 @@
" null method value");
} catch(Exception e) {
uoeTest4Passed = true;
- }
+ }
if( uoeTest1Passed && uoeTest2Passed && uoeTest3Passed &&
uoeTest4Passed ) {
- stat.addStatus("methodmapclient unsupportedop", stat.PASS);
+ stat.addStatus("methodmapclient unsupportedop", stat.PASS);
} else {
- stat.addStatus("methodmapclient unsupportedop", stat.FAIL);
+ stat.addStatus("methodmapclient unsupportedop", stat.FAIL);
}
}
private boolean testClass(Class c) {
-
+
Map regularMap = new HashMap();
Method[] methods = c.getDeclaredMethods();
@@ -196,31 +196,31 @@
for(int i = 0; i < methods.length; i++) {
regularMap.put(methods[i], methods[i].toString());
}
-
+
Map defaultMethodMap = new MethodMap(regularMap);
System.out.println("Testing " + c + " with default MethodMap");
- boolean defaultTest =
+ boolean defaultTest =
testClass(c, methods, false, regularMap, defaultMethodMap);
- boolean defaultTestOpt =
+ boolean defaultTestOpt =
testClass(c, methods, true, regularMap, defaultMethodMap);
// test degenerate case where there is only 1 bucket in MethodMap.
- // unless there are less than 2 methods in the map, this should
+ // unless there are less than 2 methods in the map, this should
// always defer to parent.
Map oneBucketMethodMap = new MethodMap(regularMap, 1);
System.out.println("Testing " + c + " with 1-bucket MethodMap");
- boolean oneBucketTest =
+ boolean oneBucketTest =
testClass(c, methods, false, regularMap, oneBucketMethodMap);
boolean oneBucketTestOpt =
testClass(c, methods, true, regularMap, oneBucketMethodMap);
Map seventeenBucketMethodMap = new MethodMap(regularMap, 17);
System.out.println("Testing " + c + " with 17-bucket MethodMap");
- boolean seventeenBucketTest =
- testClass(c, methods, false, regularMap, seventeenBucketMethodMap);
- boolean seventeenBucketTestOpt =
- testClass(c, methods, true, regularMap, seventeenBucketMethodMap);
-
+ boolean seventeenBucketTest =
+ testClass(c, methods, false, regularMap, seventeenBucketMethodMap);
+ boolean seventeenBucketTestOpt =
+ testClass(c, methods, true, regularMap, seventeenBucketMethodMap);
+
boolean clearTest = false;
try {
@@ -233,7 +233,7 @@
clearTest = true;
} else {
System.out.println("Clear() should have returned null for " +
- methods[0]
+ methods[0]
+ " after clear(). instead it " +
" returned " + obj);
}
@@ -245,8 +245,8 @@
System.out.println("clear() threw an exception");
e.printStackTrace();
}
-
- return (defaultTest && defaultTestOpt &&
+
+ return (defaultTest && defaultTestOpt &&
oneBucketTest && oneBucketTestOpt &&
seventeenBucketTest && seventeenBucketTestOpt &&
clearTest);
@@ -254,7 +254,7 @@
private boolean testClass(Class c, Method[] methods, boolean useParamOpt,
Map regularMap, Map methodMap) {
-
+
for(int i = 0; i < methods.length; i++) {
Method next = methods[i];
int numParams = next.getParameterTypes().length;
@@ -267,15 +267,15 @@
} else {
methodMapLookup = methodMap.get(next);
}
-
+
if( regularLookup != methodMapLookup ) {
System.out.println("Error. regularLookup = " + regularLookup
+ " methodMapLookup = " + methodMapLookup
+ " for Method " + next.toString());
return false;
- }
+ }
- // System.out.println("Got " + regularLookup + " for method " +
+ // System.out.println("Got " + regularLookup + " for method " +
// next.toString());
}
@@ -305,19 +305,19 @@
// array params
int abc(int[] a);
- int def(int[][][][][][][][] b);
+ int def(int[][][][][][][][] b);
// arbitrary unicode chars
void _B\u8001$();
void _CCMcx\u04e3\u05E90123();
-
+
}
private interface MethodMapTest3 {
void A();
-
+
}
private interface MethodMapTest4 extends MethodMapTest3 {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodPerf.java b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodPerf.java
index 8f08272..336a042 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodPerf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodPerf.java
@@ -29,7 +29,7 @@
return ((timeInMillis * 1000.0) / numIterations) + " micro-seconds";
}
-
+
public static void main(String args[]) {
@@ -40,7 +40,7 @@
try {
Class clz = Class.forName(className);
-
+
Map methodMap = new HashMap();
Method[] methods = clz.getMethods();
@@ -49,7 +49,7 @@
methodMap.put(methods[i], methods[i].toString());
}
-
+
System.out.println("--------------------");
System.out.println("With regular hashmap");
System.out.println("--------------------");
@@ -60,11 +60,11 @@
totalTime += time;
System.out.println(toMicroSeconds(time, numIterations) + " : " + m.getName());
}
- System.out.println("Avg time = " +
+ System.out.println("Avg time = " +
toMicroSeconds(totalTime / methods.length,
numIterations));
-
-
+
+
System.out.println("--------------------");
System.out.println("With optimized method lookup");
System.out.println("--------------------");
@@ -77,11 +77,11 @@
totalTime += time;
System.out.println(toMicroSeconds(time, numIterations) + " : " + m.getName());
}
- System.out.println("Avg time = " +
+ System.out.println("Avg time = " +
toMicroSeconds(totalTime / methods.length,
numIterations));
-
-
+
+
System.out.println("--------------------");
System.out.println("With extra optimized method lookup");
System.out.println("--------------------");
@@ -94,10 +94,10 @@
totalTime += time;
System.out.println(toMicroSeconds(time, numIterations) + " : " + m.getName());
}
- System.out.println("Avg time = " +
+ System.out.println("Avg time = " +
toMicroSeconds(totalTime / methods.length,
numIterations));
-
+
/*
System.out.println("--------------------");
System.out.println("With java.util.IdentityHashMap lookup");
@@ -113,10 +113,10 @@
*/
-
- long ihcTime = testSystemIdentityHashCode(numIterations);
+
+ long ihcTime = testSystemIdentityHashCode(numIterations);
System.out.println("system identity hash code= " + toMicroSeconds(ihcTime, numIterations));
-
+
MethodPerf ml = new MethodPerf();
@@ -131,7 +131,7 @@
System.out.println("instance strong typed invocation time = " + toMicroSeconds(i_sTime, numIterations));
long i_rTime = testStaticReflectiveInvocation(numIterations, fooMethod);
System.out.println("instance reflective invocation time = " + toMicroSeconds(i_rTime, numIterations));
-
+
} catch(Exception e) {
e.printStackTrace();
}
@@ -151,10 +151,10 @@
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
@@ -169,10 +169,10 @@
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
@@ -187,10 +187,10 @@
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
@@ -205,10 +205,10 @@
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
@@ -222,48 +222,48 @@
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
return (end - begin) - loopTime;
}
- private static long testStaticReflectiveInvocation(int numIterations, Method m)
+ private static long testStaticReflectiveInvocation(int numIterations, Method m)
throws Exception {
-
- long begin = System.currentTimeMillis();
+
+ long begin = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
m.invoke(null, null);
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
return (end - begin) - loopTime;
}
- private static long testInstanceReflectiveInvocation(int numIterations, Object o, Method m)
+ private static long testInstanceReflectiveInvocation(int numIterations, Object o, Method m)
throws Exception {
-
- long begin = System.currentTimeMillis();
+
+ long begin = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
m.invoke(o, null);
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties
index f604bc4..48c8d9f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-webservice-commit"/>
-<property name="client_pkgname" value="com.sun.s1asdev.ejb.webservice.commit.client"/>
-<property name="appname" value="${module}"/>
+<property name="client_pkgname" value="com.sun.s1asdev.ejb.webservice.commit.client"/> \u0020
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml
index 0602902..7b4f97a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml
@@ -32,12 +32,12 @@
&run;
<target name="all" depends="build,create_table,deploy,run,undeploy,delete_table"/>
-
+
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,11 +46,11 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Commit*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="create_table" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -64,16 +64,16 @@
<param name="src" value="client"/>
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="com/sun/s1asdev/ejb/webservice/commit/client/*.class"/>
</antcall>
<jar jarfile="${assemble.dir}/${appname}-client.jar" update="yes">
- <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
+ <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
excludes="META-INF/**"/>
</jar>
<antcall target="deploy-client-common"/>
</target>
-
+
<target name="wsdl-import">
<antcall target="configurable-wsdl-import">
@@ -85,7 +85,7 @@
<target name="configurable-wsdl-import">
<echo message="wsimporting ${protocol}://${host-name}:${host-port}/${server}
- Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
+ Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -p ${client_pkgname} -d ${env.APS_HOME}/build/module/classes ${protocol}://${host-name}:${host-port}/CommitBeanService/CommitBean?WSDL"/>
</exec>
@@ -93,14 +93,14 @@
<target name="run" depends="init-common">
<exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/archive">
- <arg line="-client ${module}-clientClient.jar"/>
+ <arg line="-client ${module}-clientClient.jar"/>
</exec>
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
<antcall target="undeploy-client-common"/>
- </target>
+ </target>
<target name="delete_table" depends="init-common">
<antcall target="execute-ejb-sql-common">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/Client.java
index 51a2ccb..e841e97 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/Client.java
@@ -52,11 +52,11 @@
+ " instead of system exception");
stat.addStatus(TEST_ID, stat.FAIL);
} catch(Throwable e) {
- System.out.println("Successfully received " + e +
+ System.out.println("Successfully received " + e +
"for commit failure");
- stat.addStatus(TEST_ID, stat.PASS);
+ stat.addStatus(TEST_ID, stat.PASS);
}
-
+
} catch(Exception e) {
e.printStackTrace();
stat.addStatus(TEST_ID, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java
index 4bb5274..ad010b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java
@@ -31,34 +31,34 @@
@Resource(mappedName="jdbc/__default")
private DataSource ds;
- @Resource
+ @Resource
private SessionContext sessionCtx;
public int findCustomer(int i) throws FinderException {
- Connection c = null;
- PreparedStatement ps = null;
+ Connection c = null;
+ PreparedStatement ps = null;
int returnValue = -1;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_id from O_customer where c_id = ?");
- ps.setInt(1, i);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new FinderException("No cust for " + i);
- returnValue = rs.getInt(1);
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_id from O_customer where c_id = ?");
+ ps.setInt(1, i);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new FinderException("No cust for " + i);
+ returnValue = rs.getInt(1);
System.out.println("findCustomer = " + returnValue);
- } catch (SQLException e) {
+ } catch (SQLException e) {
e.printStackTrace();
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
return returnValue;
}
@@ -66,38 +66,38 @@
public void updateCustomer() throws FinderException {
System.out.println( "In updateCustomer caller" );
-
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE O_customer SET c_phone = ? WHERE c_id = 2 AND c_phone = 'foo'");
+
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE O_customer SET c_phone = ? WHERE c_id = 2 AND c_phone = 'foo'");
ps.setString(1, "webservice");
- int result = ps.executeUpdate();
+ int result = ps.executeUpdate();
System.out.println("execute update returned " + result);
- } catch (SQLException e) {
+ } catch (SQLException e) {
e.printStackTrace();
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
System.out.println("Adding CommitStatefulBean with SessionSynch " +
" to transaction");
-
+
CommitStatefulLocal csb = (CommitStatefulLocal)
sessionCtx.lookup("csb");
csb.foo();
return;
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java
index 9bfe341..ae72c11 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java
@@ -20,7 +20,7 @@
import jakarta.annotation.Resource;
@Stateful
-public class CommitStatefulBean
+public class CommitStatefulBean
implements CommitStatefulLocal, SessionSynchronization {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/create_pointbase.sql
index 6975875..b0a3497 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/create_pointbase.sql
@@ -1,8 +1,8 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer NOT NULL PRIMARY KEY,
- c_phone char(32)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer NOT NULL PRIMARY KEY,
+ c_phone char(32)
+);
+
INSERT INTO O_Customer values (2, 'foo');
\ No newline at end of file
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties
index 68f7631..3bb091f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ksink"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="web.xml" value="descriptor/war/web.xml"/>
<property name="sun-web.xml" value="descriptor/war/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml
index e800c42..38b6515 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml
@@ -34,9 +34,9 @@
<target name="all" depends="clean,build,deploy,run,undeploy"/>
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -65,11 +65,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -f:norpcstructures -keep -d output -s output -classpath . -model googleclient.model wscompile_config_appclient.xml"/>
</antcall>
<copy todir="${build.classes.dir}/com/sun/s1asdev/ejb/webservice/ksink/googleclient">
- <fileset dir="output//com/sun/s1asdev/ejb/webservice/ksink/googleclient"
+ <fileset dir="output//com/sun/s1asdev/ejb/webservice/ksink/googleclient"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchService.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<!-- <delete dir="output"/> -->
@@ -78,11 +78,11 @@
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -f:norpcstructures -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
</antcall>
<copy todir="${build.classes.dir}/com/sun/s1asdev/ejb/webservice/ksink/googleserver">
- <fileset dir="output/com/sun/s1asdev/ejb/webservice/ksink/googleserver"
+ <fileset dir="output/com/sun/s1asdev/ejb/webservice/ksink/googleserver"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<delete dir="output"/>
@@ -91,37 +91,37 @@
<target name="wscompile-web" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -f:norpcstructures -keep -d output -s output -model googleweb.model -classpath . wscompile_config_web.xml"/>
</antcall>
<copy todir="${build.classes.dir}/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb">
- <fileset dir="output/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb"
+ <fileset dir="output/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<delete dir="output"/>
</target>
<target name="assemble" depends="init-common, compile">
- <!--
- EJB module creation
+ <!--
+ EJB module creation
-->
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch.wsdl"/>
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="GoogleMapping_ejb.xml,META-INF/wsdl/**,**/*.class" />
</antcall>
- <!--
- War module creation
+ <!--
+ War module creation
-->
<antcall target="build-war-file"/>
- <!--
- AppClient module creation
+ <!--
+ AppClient module creation
-->
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch.wsdl"/>
@@ -129,36 +129,36 @@
file="GoogleSearch_types.wsdl"/>
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch_partial.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_appclient.xml"/>
- <copy todir="${build.classes.dir}"
- file="googleclient.model"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping_appclient.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="googleclient.model"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="googleclient.model,GoogleMapping_appclient.xml,META-INF/wsdl/**,**/*.class" />
</antcall>
- <!--
- EAR file creation
+ <!--
+ EAR file creation
-->
<antcall target="ear-common" />
<copy todir="${build.classes.dir}/META-INF"
file="${sun-application.xml}"/>
- <jar destfile = "${assemble.dir}/${appname}App.ear"
- update="true">
+ <jar destfile = "${assemble.dir}/${appname}App.ear"
+ update="true">
<fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
+ <include name="META-INF/sun-application.xml"/>
</fileset>
</jar>
-
- </target>
+
+ </target>
<target name="build-appclient-file" depends="init-common">
</target>
<target name="build-war-file" depends="init-common">
<echo message="my build classes dir is:${build.classes.dir}"/>
- <delete file="${war.file}"/>
+ <delete file="${war.file}"/>
<mkdir dir="${build.classes.dir}/tmp"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF"
@@ -172,10 +172,10 @@
file="GoogleSearch.wsdl"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}/tmp"
- file="GoogleMapping_web.xml"/>
- <copy todir="${build.classes.dir}/tmp"
- file="googleweb.model"/>
+ <copy todir="${build.classes.dir}/tmp"
+ file="GoogleMapping_web.xml"/>
+ <copy todir="${build.classes.dir}/tmp"
+ file="googleweb.model"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF/classes/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb">
<fileset dir="${build.classes.dir}/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb">
<include name="**/*.class"/>
@@ -185,12 +185,12 @@
<fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
<include name="**/**"/>
</fileset>
- </jar>
+ </jar>
<delete dir="${build.classes.dir}/tmp"/>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -221,7 +221,7 @@
<target name="build-standalone" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen:client -keep -d ${build.classes.dir} -s ${build.classes.dir} -classpath . wscompile_config_standalone.xml"/>
</antcall>
<antcall target="compile-common">
@@ -241,7 +241,7 @@
<pathelement location="${env.S1AS_HOME}/lib/appserv-rt.jar"/>
<pathelement location="${env.S1AS_HOME}/lib/webservices-rt.jar"/>
<pathelement location="${env.S1AS_HOME}/lib/webservices-tools.jar"/>
- <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+ <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
<pathelement location="${build.classes.dir}"/>
</classpath>
@@ -249,10 +249,10 @@
<sysproperty key="http.proxyPort" value="8080"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="contactgoogle">
<antcall target="runclient-common">
@@ -262,34 +262,34 @@
<target name="gen-mapping-appclient" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping GoogleMapping_appclient.xml wscompile_config_appclient.xml"/>
</antcall>
</target>
<target name="gen-mapping-ejb" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping GoogleMapping_ejb.xml wscompile_config_ejb.xml"/>
</antcall>
</target>
<target name="gen-mapping-web" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping GoogleMapping_web.xml wscompile_config_web.xml"/>
</antcall>
</target>
<target name="create-user">
<antcall target="create-user-common">
- <param name="user" value="j2ee"/>
- <param name="password" value="j2ee"/>
- <param name="groups" value="staff"/>
+ <param name="user" value="j2ee"/>
+ <param name="password" value="j2ee"/>
+ <param name="groups" value="staff"/>
</antcall>
<antcall target="reconfig-common"/>
</target>
-
+
<target name="delete-user">
<!-- remove test users, just cleanup. -->
<antcall target="delete-user-common">
@@ -302,10 +302,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/Client.java
index 5aacd6a..b9f5b67 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/Client.java
@@ -30,10 +30,10 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static final QName PORT_QNAME =
+ private static final QName PORT_QNAME =
new QName("urn:GoogleSearch", "GoogleSearchPort");
private static final QName OPERATION_QNAME =
new QName("urn:GoogleSearch", "doSpellingSuggestion");
@@ -44,12 +44,12 @@
public static void main (String[] args) {
- stat.addDescription("googleserver appclient");
+ stat.addDescription("googleserver appclient");
Client client = new Client(args);
client.doTest();
stat.printSummary("googleserver-applientID");
}
-
+
public Client(String[] args) {
word = (args.length > 0) ? args[0] : "spellng";
targetEndpointAddress = (args.length > 1) ? args[1] : null;
@@ -58,8 +58,8 @@
public void doTest() {
-
- try {
+
+ try {
Context ic = new InitialContext();
String googleKey = (String)
ic.lookup("java:comp/env/googlekey");
@@ -76,7 +76,7 @@
Method helloOneWay = foo.getClass().getMethod("helloOneWay",
new Class[] { java.lang.String.class });
helloOneWay.invoke(foo, new Object[] { "1000" } );
-
+
try {
googleSearchService.getHandlerRegistry();
} catch(java.lang.UnsupportedOperationException uoe) {
@@ -95,7 +95,7 @@
doDynamicProxyTest(googleSearchService, googleKey);
- GoogleSearchPort googleSearchPort =
+ GoogleSearchPort googleSearchPort =
googleSearchService.getGoogleSearchPort();
doSpellingSuggestion(googleSearchPort, googleKey,
targetEndpointAddress);
@@ -121,7 +121,7 @@
partialWsdlServiceGeneric.getPort(GoogleSearchPort.class);
googleSearch.doSpellingSuggestion(googleKey, word);
-/** GoogleSearchService partialWsdlServiceGenerated =
+/** GoogleSearchService partialWsdlServiceGenerated =
(GoogleSearchService)
ic.lookup("java:comp/env/service/partialGenerated");
googleSearch = partialWsdlServiceGenerated.getGoogleSearchPort();
@@ -130,17 +130,17 @@
stat.addStatus("appclient " + testName, stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
System.out.println("google client test failed");
ex.printStackTrace();
stat.addStatus("appclient " + testName, stat.FAIL);
- }
+ }
}
private void doSpellingSuggestion(GoogleSearchPort googleSearchPort,
String googleKey,
- String endpointAddress)
+ String endpointAddress)
throws Exception {
if( endpointAddress != null ) {
@@ -157,7 +157,7 @@
System.out.println("Contacting google for spelling " +
"suggestion at " + endpointAddress);
-
+
String spellingSuggestion =
googleSearchPort.doSpellingSuggestion(googleKey, word);
System.out.println("Gave google the word '" + word + "' ... " +
@@ -170,21 +170,21 @@
Call c1 = service.createCall();
Call c2 = service.createCall(PORT_QNAME);
Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
+ Call c4 = service.createCall(PORT_QNAME,
OPERATION_QNAME.getLocalPart());
Call[] calls = service.getCalls(PORT_QNAME);
if( targetEndpointAddress != null ) {
- c3.setTargetEndpointAddress(targetEndpointAddress);
- }
+ c3.setTargetEndpointAddress(targetEndpointAddress);
+ }
Object params[] = new Object[] {googleKey, "hello" };
String response = (String) c3.invoke(params);
System.out.println("Response = " + response);
// container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
+ GoogleSearchPort sei = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
+ sei = (GoogleSearchPort)
service.getPort(PORT_QNAME, GoogleSearchPort.class);
QName serviceName = service.getServiceName();
@@ -197,18 +197,18 @@
System.out.println("Calling oneway operation");
Call oneway = service.createCall(PORT_QNAME, "helloOneWay");
if( targetEndpointAddress != null ) {
- oneway.setTargetEndpointAddress(targetEndpointAddress);
- }
+ oneway.setTargetEndpointAddress(targetEndpointAddress);
+ }
long oneWayMethodWaitTimeInMillis = 4000;
- Date before = new Date();
- oneway.invokeOneWay(new Object[]
+ Date before = new Date();
+ oneway.invokeOneWay(new Object[]
{ oneWayMethodWaitTimeInMillis + "" });
Date after = new Date();
long elapsedTime = after.getTime() - before.getTime();
- System.out.println("one way operation began at " + before +
- " and returned at " + after +
+ System.out.println("one way operation began at " + before +
+ " and returned at " + after +
" and took " + elapsedTime + " milli-seconds");
if( elapsedTime > oneWayMethodWaitTimeInMillis ) {
throw new Exception("one way operation blocked for too long ");
@@ -219,7 +219,7 @@
// to undeploy, but the endpoint is still executing its
// oneway operation.
long sleepTime = (oneWayMethodWaitTimeInMillis - elapsedTime);
-
+
System.out.println("now sleeping for " + sleepTime + " milli secs");
Thread.sleep(sleepTime);
System.out.println("returning from doDynamicProxyTest");
@@ -275,7 +275,7 @@
System.out.println("Successfully caught unsupported operation " +
"for Service.getPort(SEI)");
}
-
+
try {
Remote remote = service.getPort(PORT_QNAME, GoogleSearchPort.class);
} catch(java.lang.UnsupportedOperationException uoe) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/ClientHandler.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/ClientHandler.java
index a847bbe..9b21cd4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/ClientHandler.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/ClientHandler.java
@@ -27,7 +27,7 @@
import javax.naming.InitialContext;
public class ClientHandler extends GenericHandler {
-
+
public void destroy() {
System.out.println("In ClientHandler::destroy()");
}
@@ -40,17 +40,17 @@
System.out.println("In ClientHandler::handleFault()");
return true;
}
-
+
public boolean handleRequest(MessageContext context) {
System.out.println("In ClientHandler::handleRequest()");
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
System.out.println("In ClientHandler::handleResponse()");
return true;
- }
-
+ }
+
public void init(HandlerInfo config) {
System.out.println("In ClientHandler::init()");
try {
@@ -60,9 +60,9 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
System.out.println("Handler init params = " +
config.getHandlerConfig());
- }
-
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml
index a1c9395..03192a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml
@@ -97,7 +97,7 @@
</service-endpoint-interface>
<port-component-link>ksink-web.war#GoogleSearchPort</port-component-link>
</port-component-ref>
- </service-ref>
+ </service-ref>
<!-- <service-ref>
<description>partial wsdl test google service ref</description>
<service-ref-name>service/partialGenerated</service-ref-name>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml
index 3368ac5..3ab2d75 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml
@@ -19,10 +19,10 @@
-->
<sun-ejb-jar>
- <enterprise-beans>
+ <enterprise-beans>
<ejb>
<ejb-name>GoogleEjb</ejb-name>
- <jndi-name>com_sun_s1asdev_ejb_webservice_ksink_GoogleEjb</jndi-name>
+ <jndi-name>com_sun_s1asdev_ejb_webservice_ksink_GoogleEjb</jndi-name>
<webservice-endpoint>
<port-component-name>GoogleSearchEjbPort</port-component-name>
<endpoint-address-uri>ejb_webservice_ksink_GoogleEJB/GoogleSearch</endpoint-address-uri>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHandler.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHandler.java
index d1754e1..00390b9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHandler.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHandler.java
@@ -27,7 +27,7 @@
import javax.naming.InitialContext;
public class FooHandler extends GenericHandler {
-
+
public void destroy() {
System.out.println("In FooHandler::destroy()");
}
@@ -40,17 +40,17 @@
System.out.println("In FooHandler::handleFault()");
return true;
}
-
+
public boolean handleRequest(MessageContext context) {
System.out.println("In FooHandler::handleRequest()");
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
System.out.println("In FooHandler::handleResponse()");
return true;
- }
-
+ }
+
public void init(HandlerInfo config) {
System.out.println("In FooHandler::init()");
try {
@@ -60,9 +60,9 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
System.out.println("Handler init params = " +
config.getHandlerConfig());
- }
-
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java
index ca2537f..a699f1b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java
@@ -24,7 +24,7 @@
import javax.xml.rpc.Service;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,24 +33,24 @@
public class GoogleEJB implements SessionBean {
private SessionContext sc;
- private static final QName PORT_QNAME =
+ private static final QName PORT_QNAME =
new QName("urn:GoogleSearch", "GoogleSearchPort");
private static final QName OPERATION_QNAME =
new QName("urn:GoogleSearch", "doSpellingSuggestion");
-
+
public GoogleEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In GoogleEJB::ejbCreate !!");
+ System.out.println("In GoogleEJB::ejbCreate !!");
}
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
+ {
+ return null;
}
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
+ public String doSpellingSuggestion(java.lang.String key,
+ java.lang.String phrase)
{
try {
@@ -75,12 +75,12 @@
}
} catch (Exception ex) {
ex.printStackTrace();
- throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught - ", ex);
+ throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught - ", ex);
}
-
+
/*
try {
-
+
boolean result = sc.isCallerInRole("foo");
System.out.println(
"GoogleEJB.doSpellingSuggestion():isCallerInRole(foo) returned - " + result);
@@ -89,7 +89,7 @@
}
} catch (Exception ex) {
ex.printStackTrace();
- throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught in isCallerInRole(foo) call ", ex);
+ throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught in isCallerInRole(foo) call ", ex);
}
*/
@@ -99,10 +99,10 @@
Service genericServiceWithWSDL = null;
try {
InitialContext ic = new InitialContext();
- Service service = (Service)
+ Service service = (Service)
ic.lookup("java:comp/env/service/WebDIIReference");
doDynamicProxyTest(service);
- GoogleSearchPort webPort = (GoogleSearchPort)
+ GoogleSearchPort webPort = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
returnValue = webPort.doSpellingSuggestion(key, phrase);
} catch(Exception e) {
@@ -114,10 +114,10 @@
System.out.println("GoogleEJB returning " + returnValue);
return returnValue;
}
-
+
public void helloOneWay(String s1) {
- jakarta.transaction.TransactionManager tm =
+ jakarta.transaction.TransactionManager tm =
com.sun.enterprise.Switch.getSwitch().getTransactionManager();
int txStatus = -1;
try {
@@ -126,34 +126,34 @@
throw new EJBException(e);
}
- // The following tests make sure tx attributes are processed
+ // The following tests make sure tx attributes are processed
// correctly when the same method is defined on both the remote
// and webservice interface. Descriptor is set up to have
// no tx for the webservice case and a TX_REQUIRED for the
// Remote case.
try {
-
+
sc.getMessageContext();
-
+
// we were invoked through a webserivce invocation. there
// shouldn't be a transaction.
if( txStatus == jakarta.transaction.Status.STATUS_NO_TRANSACTION) {
System.out.println("Correctly found no tx for helloOneWay " +
" invoked through a webservice");
} else {
- throw new EJBException("Got wrong tx status = " + txStatus +
+ throw new EJBException("Got wrong tx status = " + txStatus +
" for helloOneWay invoked through a " +
"web service");
}
} catch(Exception e) {
// since there's no WEB service message context, we were
- // invoked through a remote invocation.
-
+ // invoked through a remote invocation.
+
if( txStatus == jakarta.transaction.Status.STATUS_ACTIVE) {
System.out.println("Correctly found an active tx for " +
"helloOneWay invoked through a Remote interface");
} else {
- throw new EJBException("Got wrong tx status = " + txStatus +
+ throw new EJBException("Got wrong tx status = " + txStatus +
" for helloOneWay invoked through a " +
"remote interface");
}
@@ -176,16 +176,16 @@
public GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) {
return null;
}
-
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
private void doDynamicProxyTest(Service service) throws Exception {
@@ -193,14 +193,14 @@
Call c1 = service.createCall();
Call c2 = service.createCall(PORT_QNAME);
Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
+ Call c4 = service.createCall(PORT_QNAME,
OPERATION_QNAME.getLocalPart());
Call[] calls = service.getCalls(PORT_QNAME);
// container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
+ GoogleSearchPort sei = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
+ sei = (GoogleSearchPort)
service.getPort(PORT_QNAME, GoogleSearchPort.class);
QName serviceName = service.getServiceName();
@@ -209,7 +209,7 @@
System.out.println("wsdlLocation = " + wsdlLocation);
}
Iterator ports = service.getPorts();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/standalone/StandAloneClient.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/standalone/StandAloneClient.java
index b36edea..ebcead5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/standalone/StandAloneClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/standalone/StandAloneClient.java
@@ -24,7 +24,7 @@
public class StandAloneClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private String word;
@@ -32,12 +32,12 @@
private String googleKey;
public static void main (String[] args) {
- stat.addDescription("googleserver standalone");
+ stat.addDescription("googleserver standalone");
StandAloneClient client = new StandAloneClient(args);
client.doTest();
stat.printSummary("googleserver-standaloneID");
}
-
+
public StandAloneClient(String[] args) {
word = (args.length > 0) ? "spellng" : args[0];
targetEndpointAddress = (args.length > 1) ?
@@ -47,11 +47,11 @@
}
public void doTest() {
- try {
- GoogleSearchService googleSearchService =
+ try {
+ GoogleSearchService googleSearchService =
new GoogleSearchService_Impl();
- GoogleSearchPort googleSearchPort =
+ GoogleSearchPort googleSearchPort =
googleSearchService.getGoogleSearchPort();
((Stub)googleSearchPort)._setProperty
@@ -72,15 +72,15 @@
spellingSuggestion + "'");
stat.addStatus("appclient main", stat.PASS);
-
- } catch (Exception ex) {
+
+ } catch (Exception ex) {
System.out.println("google client test failed");
ex.printStackTrace();
stat.addStatus("appclient main" , stat.FAIL);
- }
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/FooHandler.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/FooHandler.java
index 69c30ae..f5c3a6d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/FooHandler.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/FooHandler.java
@@ -27,7 +27,7 @@
import javax.naming.InitialContext;
public class FooHandler extends GenericHandler {
-
+
public void destroy() {
System.out.println("In FooHandler::destroy()");
}
@@ -40,17 +40,17 @@
System.out.println("In FooHandler::handleFault()");
return true;
}
-
+
public boolean handleRequest(MessageContext context) {
System.out.println("In FooHandler::handleRequest()");
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
System.out.println("In FooHandler::handleResponse()");
return true;
- }
-
+ }
+
public void init(HandlerInfo config) {
System.out.println("In FooHandler::init()");
try {
@@ -60,9 +60,9 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
System.out.println("Handler init params = " +
config.getHandlerConfig());
- }
-
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/GoogleServletImpl.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/GoogleServletImpl.java
index 0dde16d..6d04ad3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/GoogleServletImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/GoogleServletImpl.java
@@ -22,7 +22,7 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import javax.naming.*;
import javax.xml.rpc.Service;
import javax.xml.rpc.server.ServiceLifecycle;
@@ -30,11 +30,11 @@
public class GoogleServletImpl implements jakarta.servlet.SingleThreadModel, ServiceLifecycle {
- private static final QName PORT_QNAME =
+ private static final QName PORT_QNAME =
new QName("urn:GoogleSearch", "GoogleSearchPort");
private static final QName OPERATION_QNAME =
new QName("urn:GoogleSearch", "doSpellingSuggestion");
-
+
private boolean gotInit = false;
public GoogleServletImpl() {
@@ -50,9 +50,9 @@
System.out.println("Got ServiceLifecycle::destroy call");
}
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
+ {
+ return null;
}
public void helloOneWay(String s1) {
@@ -71,8 +71,8 @@
new Date());
}
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
+ public String doSpellingSuggestion(java.lang.String key,
+ java.lang.String phrase)
throws RemoteException {
System.out.println("GoogleServletImpl.doSpellingSuggestion() " +
@@ -88,22 +88,22 @@
Service genericServiceWithWSDL = null;
try {
InitialContext ic = new InitialContext();
- Service service = (Service)
+ Service service = (Service)
ic.lookup("java:comp/env/service/EjbDIIReference");
doDynamicProxyTest(service);
- GoogleSearchPort ejbPort = (GoogleSearchPort)
+ GoogleSearchPort ejbPort = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
returnValue = ejbPort.doSpellingSuggestion(key, phrase);
} catch(Exception e) {
e.printStackTrace();
throw new RemoteException(e.getMessage(), e);
}
- }
-
+ }
+
System.out.println("GoogleServletImpl returning " + returnValue);
return returnValue;
}
-
+
public GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) {
return null;
}
@@ -113,14 +113,14 @@
Call c1 = service.createCall();
Call c2 = service.createCall(PORT_QNAME);
Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
+ Call c4 = service.createCall(PORT_QNAME,
OPERATION_QNAME.getLocalPart());
Call[] calls = service.getCalls(PORT_QNAME);
// container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
+ GoogleSearchPort sei = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
+ sei = (GoogleSearchPort)
service.getPort(PORT_QNAME, GoogleSearchPort.class);
QName serviceName = service.getServiceName();
@@ -129,7 +129,7 @@
System.out.println("wsdlLocation = " + wsdlLocation);
}
Iterator ports = service.getPorts();
-
+
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml
index 1178467..36f858e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="GoogleSearch.wsdl"
packageName="com.sun.s1asdev.ejb.webservice.ksink.googleclient"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml
index 50c4eaa..76c9951 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="GoogleSearch.wsdl"
packageName="com.sun.s1asdev.ejb.webservice.ksink.googleserver"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml
index cf9caca..08a03a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="http://localhost:8080/ejb_webservice_ksink_GoogleServlet/GoogleSearch?WSDL"
packageName="com.sun.s1asdev.ejb.webservice.ksink.standalone"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml
index c446c89..cc93bfd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="GoogleSearch.wsdl"
packageName="com.sun.s1asdev.ejb.webservice.ksink.googleserverweb"/>
</configuration>
