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/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/build.properties
index bc15b60..d9e7cb3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-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="bean-in-lib-dir-used-by-ejb-in-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/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/build.xml
index b0d5372..5a83b5a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/build.xml
@@ -31,100 +31,100 @@
<target name="all" depends="clean,build,deploy,run,undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common" />
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="compile" depends="clean">
- <!-- compile library -->
- <antcall target="compile-common">
- <param name="src" value="lib" />
- </antcall>
+ <target name="compile" depends="clean">
+ <!-- compile library -->
+ <antcall target="compile-common">
+ <param name="src" value="lib" />
+ </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejb" />
- </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="ejb" />
+ </antcall>
- <antcall target="compile-common">
- <param name="src" value="war" />
- </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="war" />
+ </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>
- </target>
+ <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>
- <target name="build" depends="compile">
- <mkdir dir="${assemble.dir}" />
+ <target name="build" depends="compile">
+ <mkdir dir="${assemble.dir}" />
- <!-- build library jar -->
- <mkdir dir="${build.classes.dir}/META-INF" />
- <copy file="${persistence.xml}" tofile="${build.classes.dir}/META-INF/persistence.xml" failonerror="false" />
- <copy file="${beans.xml}" tofile="${build.classes.dir}/META-INF/beans.xml" failonerror="false" />
- <mkdir dir="${build.classes.dir}/lib-dir" />
- <jar jarfile="${build.classes.dir}/lib-dir/lib.jar" basedir="${build.classes.dir}" includes="com/acme/util/*.class, com/acme/ejb/api/*.class">
- <metainf dir="${build.classes.dir}/META-INF">
- <include name="persistence.xml" />
- <include name="beans.xml" />
- </metainf>
- </jar>
- <copy file="${env.APS_HOME}/lib/reporter.jar" todir="${build.classes.dir}/lib-dir" />
+ <!-- build library jar -->
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <copy file="${persistence.xml}" tofile="${build.classes.dir}/META-INF/persistence.xml" failonerror="false" />
+ <copy file="${beans.xml}" tofile="${build.classes.dir}/META-INF/beans.xml" failonerror="false" />
+ <mkdir dir="${build.classes.dir}/lib-dir" />
+ <jar jarfile="${build.classes.dir}/lib-dir/lib.jar" basedir="${build.classes.dir}" includes="com/acme/util/*.class, com/acme/ejb/api/*.class">
+ <metainf dir="${build.classes.dir}/META-INF">
+ <include name="persistence.xml" />
+ <include name="beans.xml" />
+ </metainf>
+ </jar>
+ <copy file="${env.APS_HOME}/lib/reporter.jar" todir="${build.classes.dir}/lib-dir" />
- <!-- build EJB jar -->
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="com/acme/ejb/impl/*.class" />
- </antcall>
+ <!-- build EJB jar -->
+ <antcall target="ejb-jar-common">
+ <param name="ejbjar.classes" value="com/acme/ejb/impl/*.class" />
+ </antcall>
- <!-- delete EJB impl and lib classes as WAR should not have them -->
- <delete includeEmptyDirs="true">
- <fileset dir="${build.classes.dir}/com/acme/ejb/" />
- <fileset dir="${build.classes.dir}/com/acme/util/" />
- </delete>
+ <!-- delete EJB impl and lib classes as WAR should not have them -->
+ <delete includeEmptyDirs="true">
+ <fileset dir="${build.classes.dir}/com/acme/ejb/" />
+ <fileset dir="${build.classes.dir}/com/acme/util/" />
+ </delete>
- <!-- create WAR -->
- <antcall target="webclient-war-common">
- <param name="hasWebclient" value="true" />
- </antcall>
+ <!-- create WAR -->
+ <antcall target="webclient-war-common">
+ <param name="hasWebclient" value="true" />
+ </antcall>
- <!-- assemble EAR -->
- <delete file="${assemble.dir}/${appname}.ear" />
- <mkdir dir="${assemble.dir}" />
- <mkdir dir="${build.classes.dir}/META-INF" />
- <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false" />
- <copy file="${glassfish-resources-ear.xml}" tofile="${build.classes.dir}/META-INF/glassfish-resources.xml" failonerror="false" filtering="true" />
- <ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
- <fileset dir="${assemble.dir}">
- <include name="*.jar" />
- <include name="*.war" />
- </fileset>
- <fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml" />
- <include name="META-INF/glassfish-resources.xml" />
- </fileset>
- <fileset dir="${build.classes.dir}" includes="lib-dir/*" />
- </ear>
+ <!-- assemble EAR -->
+ <delete file="${assemble.dir}/${appname}.ear" />
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false" />
+ <copy file="${glassfish-resources-ear.xml}" tofile="${build.classes.dir}/META-INF/glassfish-resources.xml" failonerror="false" filtering="true" />
+ <ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar" />
+ <include name="*.war" />
+ </fileset>
+ <fileset dir="${build.classes.dir}">
+ <include name="META-INF/sun-application.xml" />
+ <include name="META-INF/glassfish-resources.xml" />
+ </fileset>
+ <fileset dir="${build.classes.dir}" includes="lib-dir/*" />
+ </ear>
- </target>
+ </target>
- <target name="deploy" depends="init-common">
- <antcall target="deploy-common" />
- </target>
+ <target name="deploy" depends="init-common">
+ <antcall target="deploy-common" />
+ </target>
- <target name="run" depends="init-common">
- <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="${contextroot}" />
- <arg line="${http.host}" />
- <arg line="${http.port}" />
- </java>
- </target>
+ <target name="run" depends="init-common">
+ <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="${contextroot}" />
+ <arg line="${http.host}" />
+ <arg line="${http.port}" />
+ </java>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common" />
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common" />
+ </target>
- <target name="usage">
- <antcall target="usage-common" />
- </target>
+ <target name="usage">
+ <antcall target="usage-common" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/client/com/acme/Client.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/client/com/acme/Client.java
index b0b64b9..43c0efa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/client/com/acme/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/client/com/acme/Client.java
@@ -30,7 +30,7 @@
private static final String TEST_NAME = "bean-in-lib-dir-of-ear-used-by-ejb";
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
index 814451f..afe9d54 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
@@ -45,16 +45,16 @@
@PersistenceUnit(unitName = "pu1")
@TestDatabase
private EntityManagerFactory emf;
-
+
@Inject
TestManagedBean tmb;
-
+
@Inject
TestDependentBeanInLib tdbil;
-
+
@Inject
TestSessionScopedBeanInLib tssil;
-
+
@PostConstruct
private void init() {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/Singleton4.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/Singleton4.java
index a54c59e..6aa1f24 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/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/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/ResourcesProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/ResourcesProducer.java
index ea029ac..96e2d0a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/ResourcesProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/ResourcesProducer.java
@@ -28,10 +28,10 @@
@PersistenceContext(unitName = "pu1")
@TestDatabase
EntityManager customerDatabasePersistenceUnit;
-
+
@Inject
TestDependentBeanInLib foo;
-
+
public boolean isInjectionSuccessful(){
return (foo != null);
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestDependentBeanInLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestDependentBeanInLib.java
index 9596b22..61d49b6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestDependentBeanInLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestDependentBeanInLib.java
@@ -21,7 +21,7 @@
public TestDependentBeanInLib() {
super();
}
-
+
public String foo(){
return "foo!";
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/UtilInLibDir.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/UtilInLibDir.java
index 18e76ab..9ef6d61 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/UtilInLibDir.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/UtilInLibDir.java
@@ -17,10 +17,10 @@
package com.acme.util;
public class UtilInLibDir {
-
+
public int add(int i1, int i2) {
return i1+i2;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java
index 550b0a3..b622590 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java
@@ -37,60 +37,60 @@
@SuppressWarnings("serial")
public class HelloServlet extends HttpServlet {
String msg = "";
-
+
@EJB(name = "java:module/m1", beanName = "HelloSingleton", beanInterface = Hello.class)
Hello h;
-
+
@PersistenceUnit(unitName = "pu1")
@TestDatabase
private EntityManagerFactory emf;
// @Inject
// private ResourcesProducer rp;
-//
+//
// @Inject
// private TestDependentBeanInLib fb;
-
+
// @Inject
// private TestManagedBean tmb;
-
+
// @Inject
// private TestSessionScopedBeanInLib tssil;
-
+
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
System.out.println("In HelloServlet::doGet");
resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
-
+
checkForNull(emf, "Injection of EMF failed in Servlet");
//ensure EMF works!
emf.createEntityManager();
-
+
//call Singleton EJB
String response = h.hello();
if(!response.equals(Hello.ALL_OK_STRING))
msg += "Invocation of Hello Singeton EJB failed:msg=" + response;
-
+
// if (!rp.isInjectionSuccessful())
// msg += "Injection of a bean in lib directory into another " +
-// "Bean in lib directory failed";
+// "Bean in lib directory failed";
// checkForNull(fb, "Injection of a bean that is placed in lib directory " +
-// "into a Servlet that is placed in a WAR failed");
+// "into a Servlet that is placed in a WAR failed");
// checkForNull(tmb, "Injection of a Managed bean that is placed in lib directory " +
// "into a Servlet that is placed in a WAR failed");
// checkForNull(tssil, "Injection of a session scoped Bean placed in lib dir into a " +
// "into a servlet in that ear failed");
-
+
// if (!rp.isInjectionSuccessful())
// msg += "Injection of a bean in lib directory into another Bean " +
-// "in lib directory failed";
-
+// "in lib directory failed";
+
// if (!tmb.isInjectionSuccessful())
// msg += "Injection of a Bean placed in lib dir into a " +
-// "ManagedBean placed in lib dir failed";
-
+// "ManagedBean placed in lib dir failed";
+
out.println(msg);
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/build.xml
index b3dff66..6c0b13c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/build.xml
@@ -77,7 +77,7 @@
<target name="javaee-int">
<record name="javaee-int.output" action="start" />
-
+
<ant dir="builtin-beans" target="${javaee-int-target}" />
<ant dir="servlet-context-injection-cdi" target="${javaee-int-target}" />
<ant dir="simple-managed-bean-interceptor-nonnull-package" target="${javaee-int-target}" />
@@ -97,14 +97,14 @@
<target name="usage">
<echo> Usage:
- ant all (Executes all the javaee-int tests)
- ant clean (cleans all the javaee-int tests)
- ant build (builds all the javaee-int tests)
- ant setup (sets up all resources for javaee-int tests)
- ant deploy (deploys all the javaee-int apps)
- ant run (Executes all the javaee-int tests)
- ant undeploy (undeploys all the javaee-int apps)
- ant unsetup (unsets all resources for javaee-int tests)
- </echo>
+ ant all (Executes all the javaee-int tests)
+ ant clean (cleans all the javaee-int tests)
+ ant build (builds all the javaee-int tests)
+ ant setup (sets up all resources for javaee-int tests)
+ ant deploy (deploys all the javaee-int apps)
+ ant run (Executes all the javaee-int tests)
+ ant undeploy (undeploys all the javaee-int apps)
+ ant unsetup (unsets all resources for javaee-int tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/build.properties
index 3543e4c..72176d6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/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="cdi"/>
<property name="appname" value="${module}-typesafe-javaee-resource-injection"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/build.xml
index 295d086..eb790bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/build.xml
@@ -33,75 +33,75 @@
<target name="all" depends="build,create-resources,deploy,run,undeploy,delete-resources" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common" />
- <delete>
- <fileset dir="." includes="*.class" />
- <fileset dir="client/test/client" includes="*.class" />
- </delete>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete>
+ <fileset dir="." includes="*.class" />
+ <fileset dir="client/test/client" includes="*.class" />
+ </delete>
+ </target>
- <target name="compile" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="servlet" />
- </antcall>
- </target>
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="servlet" />
+ </antcall>
+ </target>
- <target name="build" depends="compile">
- <property name="hasWebclient" value="yes" />
- <antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes" />
- <param name="webclient.war.classes" value="**/*.class" />
- </antcall>
+ <target name="build" depends="compile">
+ <property name="hasWebclient" value="yes" />
+ <antcall target="webclient-war-common">
+ <param name="hasWebclient" value="yes" />
+ <param name="webclient.war.classes" value="**/*.class" />
+ </antcall>
- <javac srcdir="client" classpath="${env.APS_HOME}/lib/reportbuilder.jar" includes="test/client/WebTest.java" />
+ <javac srcdir="client" classpath="${env.APS_HOME}/lib/reportbuilder.jar" includes="test/client/WebTest.java" />
- </target>
+ </target>
- <target name="build-publish-war" depends="build, publish-war-common" />
+ <target name="build-publish-war" depends="build, publish-war-common" />
- <target name="deploy" depends="init-common">
- <antcall target="deploy-war-common" />
- </target>
+ <target name="deploy" depends="init-common">
+ <antcall target="deploy-war-common" />
+ </target>
- <target name="create-resources" depends="init-common">
- <antcall target="create-jdbc-connpool-common">
- <param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
- </antcall>
- <antcall target="create-jdbc-resource-common">
- <param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
- <param name="jdbc.resource.name" value="jdbc/jdbc-dev-test-resource" />
- </antcall>
- </target>
+ <target name="create-resources" depends="init-common">
+ <antcall target="create-jdbc-connpool-common">
+ <param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
+ </antcall>
+ <antcall target="create-jdbc-resource-common">
+ <param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
+ <param name="jdbc.resource.name" value="jdbc/jdbc-dev-test-resource" />
+ </antcall>
+ </target>
- <target name="run" depends="init-common">
- <java classname="test.client.WebTest">
- <arg value="${http.host}" />
- <arg value="${http.port}" />
- <arg value="${contextroot}" />
- <classpath>
- <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar" />
- <pathelement location="client" />
- </classpath>
- </java>
- </target>
+ <target name="run" depends="init-common">
+ <java classname="test.client.WebTest">
+ <arg value="${http.host}" />
+ <arg value="${http.port}" />
+ <arg value="${contextroot}" />
+ <classpath>
+ <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar" />
+ <pathelement location="client" />
+ </classpath>
+ </java>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common" />
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="delete-resources" depends="init-common">
- <antcall target="delete-jdbc-resource-common">
- <param name="jdbc.resource.name" value="jdbc/jdbc-dev-test-resource" />
- </antcall>
+ <target name="delete-resources" depends="init-common">
+ <antcall target="delete-jdbc-resource-common">
+ <param name="jdbc.resource.name" value="jdbc/jdbc-dev-test-resource" />
+ </antcall>
- <antcall target="delete-jdbc-connpool-common">
- <param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
- </antcall>
- </target>
+ <antcall target="delete-jdbc-connpool-common">
+ <param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
+ </antcall>
+ </target>
- <target name="usage">
- <antcall target="usage-common" />
- </target>
+ <target name="usage">
+ <antcall target="usage-common" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/TestBeanInterface.java
index 29e137a..e5be4d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/TestBeanInterface.java
@@ -19,6 +19,6 @@
public interface TestBeanInterface {
public void m1();
public void m2();
-
+
public String testDatasourceInjection();
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/nonmock/TestBean.java
index 338a3bf..b46dd27 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/nonmock/TestBean.java
@@ -29,8 +29,8 @@
@Preferred
public class TestBean implements TestBeanInterface{
public static boolean testBeanInvoked = false;
-
- @Inject @TestDatabase
+
+ @Inject @TestDatabase
DataSource ds;
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/DatabaseManager.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/DatabaseManager.java
index 6c595cd..257feaa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/DatabaseManager.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/DatabaseManager.java
@@ -23,9 +23,9 @@
import test.beans.artifacts.TestDatabase;
public class DatabaseManager {
- @Produces
+ @Produces
@TestDatabase
- @Resource(name = "jdbc/jdbc-dev-test-resource",
+ @Resource(name = "jdbc/jdbc-dev-test-resource",
mappedName = "jdbc/jdbc-dev-test-resource")
DataSource ds;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/WebTest.java
index d1198c4..fc215de 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebServlet");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/build.properties
index 493d4a8..d64d3da 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/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="cdi"/>
<property name="appname" value="${module}-servlet-annotation-with-web-inf-lib-extension-alternative"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/build.xml
index 601c3db..8e591be 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete file="lib/bean-lib.jar"/>
</target>
-
+
<target name="compile" depends="clean">
<!-- create WEB-INF/lib/bean-lib.jar -->
<mkdir dir="${build.classes.dir}"/>
@@ -56,8 +56,8 @@
<fileset dir="${build.classes.dir}"/>
</jar>
<delete dir="${build.classes.dir}"/>
-
- <!-- compile test servlet -->
+
+ <!-- compile test servlet -->
<mkdir dir="${build.classes.dir}"/>
<echo message="common.xml: Compiling test source files" level="verbose"/>
<mkdir dir="servlet"/>
@@ -65,23 +65,23 @@
</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="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="create-resources" depends="init-common">
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
@@ -91,7 +91,7 @@
<param name="jdbc.resource.name" value="jdbc/jdbc-dev-test-resource" />
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -103,11 +103,11 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/jdbc-dev-test-resource" />
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBean.java
index 9a2cecf..e77ed6a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBean.java
@@ -27,8 +27,8 @@
@Preferred
public class TestBean implements TestBeanInterface{
public static boolean testBeanInvoked = false;
-
- @Inject //@TestDatabase
+
+ @Inject //@TestDatabase
EntityManager emf;
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBeanInterface.java
index 29e137a..e5be4d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBeanInterface.java
@@ -19,6 +19,6 @@
public interface TestBeanInterface {
public void m1();
public void m2();
-
+
public String testDatasourceInjection();
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java
index 61cb0df..d086167 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java
@@ -51,7 +51,7 @@
public class TestServlet extends HttpServlet {
/* Normal injection of Beans */
- @Inject
+ @Inject
private transient org.jboss.logging.Logger log;
@Inject BeanManager bm_at_inj;
@@ -64,26 +64,26 @@
private @Resource
UserTransaction utx;
-
+
@Inject @Preferred
TestBeanInterface tbi;
-
+
/* Injection of Beans from WEB-INF/lib */
- @Inject TestBeanInWebInfLib tbiwil;
+ @Inject TestBeanInWebInfLib tbiwil;
//We are injecting TestBeanInWebInfLib directly above. Since the alternative
- //TestBean is not enabled in the WAR's BDA(beans.xml),
- //TestBeanInWebInfLib must be injected
-
-
+ //TestBean is not enabled in the WAR's BDA(beans.xml),
+ //TestBeanInWebInfLib must be injected
+
+
@Inject AnotherTestBeanInWebInfLib atbiwil;
//However in this case, when AnotherTestBeanInWebInfLib tries to inject
//TestBeanInWebInfLib in its bean, it must inject TestAlternativeBeanInWebInfLib
- //as the alternative bean is enabled in the WEB-INF/lib's BDA (beans.xml)
+ //as the alternative bean is enabled in the WEB-INF/lib's BDA (beans.xml)
/* Test lookup of BeanManager*/
BeanManager bm_lookup;
-
+
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
@@ -108,7 +108,7 @@
//via BeanManager of WAR
Set warBeans = bm_at_inj.getBeans(TestBean.class,new AnnotationLiteral<Any>() {});
if (warBeans.size() != 1) msg += "TestBean in WAR is not available via the WAR BeanManager";
-
+
Set webinfLibBeans = bm_at_inj.getBeans(TestBeanInWebInfLib.class,new AnnotationLiteral<Any>() {});
if (webinfLibBeans.size() != 1) msg += "TestBean in WEB-INF/lib is not available via the WAR BeanManager";
System.out.println("Test Bean from WEB-INF/lib via BeanManager:" + webinfLibBeans);
@@ -118,20 +118,20 @@
Set webinfLibAltBeans = bm_at_inj.getBeans(TestAlternativeBeanInWebInfLib.class,new AnnotationLiteral<Any>() {});
if (webinfLibAltBeans.size() != 0) msg += "TestAlternativeBean in WEB-INF/lib is available via the WAR BeanManager";
System.out.println("Test Bean from WEB-INF/lib via BeanManager:" + webinfLibAltBeans);
-
+
//Test injection of a Bean in WEB-INF/lib beans into Servlet
//and check that the Alternative bean is not called.
//The alternative bean in web-inf/lib is not enabled in the WAR's beans.xml
//and hence must not be visible.
TestAlternativeBeanInWebInfLib.clearStatus(); //clear status
-
+
String injectionOfBeanInWebInfLibResult = tbiwil.testInjection();
System.out.println("injectionWithAlternative returned: " + injectionOfBeanInWebInfLibResult);
if (injectionOfBeanInWebInfLibResult.equals ("Alternative")) {
msg += "Expected that the original TestBeanInWebInfLib is called, " +
- "but instead got " + injectionOfBeanInWebInfLibResult + " instead";
- }
-
+ "but instead got " + injectionOfBeanInWebInfLibResult + " instead";
+ }
+
if(TestAlternativeBeanInWebInfLib.ALTERNATIVE_BEAN_HAS_BEEN_CALLED) {
msg += "Alternate Bean is called even though it is not enabled in the WAR's beans.xml";
}
@@ -151,13 +151,13 @@
if (!TestAlternativeBeanInWebInfLib.ALTERNATIVE_BEAN_HAS_BEEN_CALLED) {
msg += "Alternative Bean enabled in WEB-INF/lib was not called " +
- "when the injection happened in the context of a " +
- "Bean in WEB-INF/lib where the alternative Bean was enabled";
+ "when the injection happened in the context of a " +
+ "Bean in WEB-INF/lib where the alternative Bean was enabled";
}
-
+
msg += testEMInjection(req);
-
+
writer.write(msg + "\n");
}
@@ -180,7 +180,7 @@
} else if ("llquery".equals(testcase)) {
status = jt.lazyLoadingByQuery("Carla");
} else if ("llinj".equals(testcase)){
- status = ((tbi != null) &&
+ status = ((tbi != null) &&
(tbi.testDatasourceInjection().trim().length()==0));
}
if (status) {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JPAResourceProducer.java
index 18bba77..92616f2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JPAResourceProducer.java
@@ -24,7 +24,7 @@
@Singleton
public class JPAResourceProducer {
@Produces @PersistenceContext(unitName="pu1")
- //@TestDatabase
+ //@TestDatabase
EntityManager customerDatabasePersistenceUnit;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestAlternativeBeanInWebInfLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestAlternativeBeanInWebInfLib.java
index f05634d..539436f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestAlternativeBeanInWebInfLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestAlternativeBeanInWebInfLib.java
@@ -31,7 +31,7 @@
System.out.println("*************** testinjection in alternative bean in web-inf/lib called");
return "Alternative";
}
-
+
public static void clearStatus(){
ALTERNATIVE_BEAN_HAS_BEEN_CALLED = false;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestBeanInWebInfLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestBeanInWebInfLib.java
index 387ac45..c5ef267 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestBeanInWebInfLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestBeanInWebInfLib.java
@@ -28,11 +28,11 @@
public class TestBeanInWebInfLib {
@Inject
BeanManager bm;
-
-// @Inject //@TestDatabase
+
+// @Inject //@TestDatabase
// EntityManager emf_at_inj;
- @PersistenceContext(unitName="pu1")
+ @PersistenceContext(unitName="pu1")
EntityManager emf_at_pu;
//This test injection method would be called in the context of the servlet in WAR
@@ -45,22 +45,22 @@
System.out.println("EMF injected in WEB-INF/lib bean is " + emf_at_pu);
if (emf_at_pu == null)
return "EMF injected via @PersistenceContext is not injected into " +
- "the TestBean packaged in WEB-INF/lib";
-
+ "the TestBean packaged in WEB-INF/lib";
+
Set<Bean<?>> webinfLibBeans = bm.getBeans(TestBeanInWebInfLib.class, new AnnotationLiteral<Any>() {});
if (webinfLibBeans.size() != 2) //Bean and enabled Alternative
return "TestBean in WEB-INF/lib is not available via the WEB-INF/lib "
+ "Bean's BeanManager";
System.out.println("***********************************************************");
printBeans(webinfLibBeans, "BeanManager.getBeans(TestBeanInWebInfLib, Any):");
-
+
Set<Bean<?>> webinfLibAltBeans = bm.getBeans(TestAlternativeBeanInWebInfLib.class, new AnnotationLiteral<Any>() {});
if (webinfLibBeans.size() != 1) //enabled Alternative
return "TestAlternativeBean in WEB-INF/lib is not available via the WEB-INF/lib "
+ "Bean's BeanManager";
printBeans(webinfLibAltBeans, "BeanManager.getBeans(TestAlternativeBeanInWebInfLib, Any):");
-
-
+
+
Iterable<Bean<?>> accessibleBeans = ((org.jboss.weld.manager.BeanManagerImpl) bm).getAccessibleBeans();
printBeans(accessibleBeans, "BeanManagerImpl.getAccessibleBeans:");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/WebTest.java
index 9eccfad..cc2a59e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebServlet");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/build.properties
index cf2f0c0..9204cbb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/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="cdi"/>
<property name="appname" value="${module}-servlet-annotation-with-web-inf-lib-javaee-injection"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/build.xml
index 0640665..0c62f29 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete file="lib/bean-lib.jar"/>
</target>
-
+
<target name="compile" depends="clean">
<!-- create WEB-INF/lib/bean-lib.jar -->
<mkdir dir="${build.classes.dir}"/>
@@ -54,8 +54,8 @@
<fileset dir="${build.classes.dir}"/>
</jar>
<delete dir="${build.classes.dir}"/>
-
- <!-- compile test servlet -->
+
+ <!-- compile test servlet -->
<mkdir dir="${build.classes.dir}"/>
<echo message="common.xml: Compiling test source files" level="verbose"/>
<mkdir dir="servlet"/>
@@ -63,23 +63,23 @@
</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="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="create-resources" depends="init-common">
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
@@ -89,7 +89,7 @@
<param name="jdbc.resource.name" value="jdbc/jdbc-dev-test-resource" />
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -101,11 +101,11 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/jdbc-dev-test-resource" />
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBean.java
index 104c6b0..f46e094 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBean.java
@@ -26,8 +26,8 @@
@Preferred
public class TestBean implements TestBeanInterface{
public static boolean testBeanInvoked = false;
-
- @Inject //@TestDatabase
+
+ @Inject //@TestDatabase
EntityManager emf;
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBeanInterface.java
index 29e137a..e5be4d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBeanInterface.java
@@ -19,6 +19,6 @@
public interface TestBeanInterface {
public void m1();
public void m2();
-
+
public String testDatasourceInjection();
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java
index 395118c..25a669c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java
@@ -50,7 +50,7 @@
public class TestServlet extends HttpServlet {
/* Normal injection of Beans */
- @Inject
+ @Inject
private transient org.jboss.logging.Logger log;
@Inject BeanManager bm_at_inj;
@@ -63,17 +63,17 @@
private @Resource
UserTransaction utx;
-
+
@Inject @Preferred
TestBeanInterface tbi;
-
+
/* Injection of Beans from WEB-INF/lib */
@Inject TestBeanInWebInfLib tbiwil;
-
+
/* Test lookup of BeanManager*/
BeanManager bm_lookup;
-
+
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
@@ -101,16 +101,16 @@
//via BeanManager of WAR
Set warBeans = bm_at_inj.getBeans(TestBean.class,new AnnotationLiteral<Any>() {});
if (warBeans.size() != 1) msg += "TestBean in WAR is not available via the WAR BeanManager";
-
+
Set webinfLibBeans = bm_at_inj.getBeans(TestBeanInWebInfLib.class,new AnnotationLiteral<Any>() {});
if (webinfLibBeans.size() != 1) msg += "TestBean in WEB-INF/lib is not available via the WAR BeanManager";
System.out.println("Test Bean from WEB-INF/lib via BeanManager:" + webinfLibBeans);
-
+
//Test injection into WEB-INF/lib beans
msg += tbiwil.testInjection();
-
+
msg += testEMInjection(req);
-
+
writer.write("initParams: " + msg + "\n");
}
@@ -133,7 +133,7 @@
} else if ("llquery".equals(testcase)) {
status = jt.lazyLoadingByQuery("Carla");
} else if ("llinj".equals(testcase)){
- status = ((tbi != null) &&
+ status = ((tbi != null) &&
(tbi.testDatasourceInjection().trim().length()==0));
}
if (status) {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JPAResourceProducer.java
index 18bba77..92616f2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JPAResourceProducer.java
@@ -24,7 +24,7 @@
@Singleton
public class JPAResourceProducer {
@Produces @PersistenceContext(unitName="pu1")
- //@TestDatabase
+ //@TestDatabase
EntityManager customerDatabasePersistenceUnit;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/util/test/beans/wbinflib/TestBeanInWebInfLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/util/test/beans/wbinflib/TestBeanInWebInfLib.java
index 7635ce1..d8f026d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/util/test/beans/wbinflib/TestBeanInWebInfLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/util/test/beans/wbinflib/TestBeanInWebInfLib.java
@@ -29,11 +29,11 @@
public class TestBeanInWebInfLib {
@Inject
BeanManager bm;
-
-// @Inject //@TestDatabase
+
+// @Inject //@TestDatabase
// EntityManager emf_at_inj;
- @PersistenceContext(unitName="pu1")
+ @PersistenceContext(unitName="pu1")
EntityManager emf_at_pu;
public String testInjection() {
@@ -44,8 +44,8 @@
System.out.println("EMF injected in WEB-INF/lib bean is " + emf_at_pu);
if (emf_at_pu == null)
return "EMF injected via @PersistenceContext is not injected into " +
- "the TestBean packaged in WEB-INF/lib";
-
+ "the TestBean packaged in WEB-INF/lib";
+
Set<Bean<?>> webinfLibBeans = bm.getBeans(TestBeanInWebInfLib.class, new AnnotationLiteral<Any>() {});
if (webinfLibBeans.size() != 1)
return "TestBean in WEB-INF/lib is not available via the WEB-INF/lib "
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/WebTest.java
index 9cabb3d..5b8615e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/WebTest.java
@@ -69,7 +69,7 @@
line = input.readLine();
System.out.println("line = " + line);
}
-
+
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/build.properties
index c6b5b5a..eb38a19 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/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="cdi"/>
<property name="appname" value="${module}-servlet-annotation-with-web-inf-lib-with-ordering-reversed"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/servlet/TestBean.java
index 8bcebb4..f691d97 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/servlet/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/servlet/TestBean.java
@@ -15,7 +15,7 @@
*/
package servlet;
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
public class TestBean {
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/servlet/TestServlet.java
index 9946f12..ba992bb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/servlet/TestServlet.java
@@ -37,21 +37,21 @@
import javax.naming.InitialContext;
@WebServlet(
- name = "mytest",
- urlPatterns = { "/myurl" },
- initParams = {
+ name = "mytest",
+ urlPatterns = { "/myurl" },
+ initParams = {
@WebInitParam(name = "n1", value = "v1"),
@WebInitParam(name = "n2", value = "v2") })
public class TestServlet extends HttpServlet {
@Inject
TestBean tb;
-
+
@Inject
BeanManager bm;
@Inject
Foo f; // from WEB-INF/lib/alpha.jar
-
+
@Inject
Bar b; // from WEB-INF/lib/bravo.jar
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/WebTest.java
index 2a1453f..ef31514 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/WebTest.java
@@ -69,7 +69,7 @@
line = input.readLine();
System.out.println("line = " + line);
}
-
+
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/build.properties
index 542d011..f895064 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/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="cdi"/>
<property name="appname" value="${module}-servlet-annotation-with-web-inf-lib-with-ordering"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/servlet/TestBean.java
index 8bcebb4..f691d97 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/servlet/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/servlet/TestBean.java
@@ -15,7 +15,7 @@
*/
package servlet;
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
public class TestBean {
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/servlet/TestServlet.java
index 9252f2d..0384454 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/servlet/TestServlet.java
@@ -38,21 +38,21 @@
import javax.naming.InitialContext;
@WebServlet(
- name = "mytest",
- urlPatterns = { "/myurl" },
- initParams = {
+ name = "mytest",
+ urlPatterns = { "/myurl" },
+ initParams = {
@WebInitParam(name = "n1", value = "v1"),
@WebInitParam(name = "n2", value = "v2") })
public class TestServlet extends HttpServlet {
@Inject
TestBean tb;
-
+
@Inject
BeanManager bm;
@Inject
Foo f; // from WEB-INF/lib/alpha.jar
-
+
@Inject
Bar b; // from WEB-INF/lib/bravo.jar
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/WebTest.java
index 1ea710b..fe7b4b2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebServlet");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -95,10 +95,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/build.properties
index bb7bc8d..5d7ede5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/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="cdi"/>
<property name="appname" value="${module}-servlet-annotation-with-web-inf-lib"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/build.xml
index 7f7f3ee..f18141b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete file="lib/bean-lib.jar"/>
</target>
-
+
<target name="compile" depends="clean">
<!-- create WEB-INF/lib/bean-lib.jar -->
<mkdir dir="${build.classes.dir}"/>
@@ -54,8 +54,8 @@
<fileset dir="${build.classes.dir}"/>
</jar>
<delete dir="${build.classes.dir}"/>
-
- <!-- compile test servlet -->
+
+ <!-- compile test servlet -->
<mkdir dir="${build.classes.dir}"/>
<echo message="common.xml: Compiling test source files" level="verbose"/>
<mkdir dir="servlet"/>
@@ -63,23 +63,23 @@
</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="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}"/>
@@ -91,10 +91,10 @@
</classpath>
</java>
</target>
-
+
<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/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestBean.java
index c696caf..608c4c7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestBean.java
@@ -14,8 +14,8 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-//Simple TestBean to test CDI.
-public class TestBean
+//Simple TestBean to test CDI.
+public class TestBean
{
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestServlet.java
index 908a5cd..8bd9e05 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestServlet.java
@@ -41,8 +41,8 @@
@Inject TestBeanInWebInfLib tbiwil;
BeanManager bm1;
-
- @Inject
+
+ @Inject
private transient org.jboss.logging.Logger log;
public void service(HttpServletRequest req, HttpServletResponse res)
@@ -72,14 +72,14 @@
//via BeanManager of WAR
Set warBeans = bm.getBeans(TestBean.class,new AnnotationLiteral<Any>() {});
if (warBeans.size() != 1) msg += "TestBean in WAR is not available via the WAR BeanManager";
-
+
Set webinfLibBeans = bm.getBeans(TestBeanInWebInfLib.class,new AnnotationLiteral<Any>() {});
if (webinfLibBeans.size() != 1) msg += "TestBean in WEB-INF/lib is not available via the WAR BeanManager";
System.out.println("Test Bean from WEB-INF/lib via BeanManager:" + webinfLibBeans);
-
+
//Test injection into WEB-INF/lib beans
msg += tbiwil.testInjection();
-
+
writer.write("initParams: " + msg + "\n");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/build.xml
index 8be2ab7..a9323d5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/build.xml
@@ -38,8 +38,8 @@
<antcall target="build-ear"/>
<!--
<antcall target="ear-common">
- <param name="appname" value="generic-embedded"/>
- <param name="application.xml" value="META-INF/application.xml"/>
+ <param name="appname" value="generic-embedded"/>
+ <param name="application.xml" value="META-INF/application.xml"/>
</antcall>
-->
</target>
@@ -51,7 +51,7 @@
<mkdir dir="${build.classes.dir}/META-INF"/>
<ear earfile="${assemble.dir}/generic-embeddedApp.ear"
appxml="META-INF/application.xml">
-
+
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/META-INF/ejb-jar.xml
index 696dd3e..5a5210e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/META-INF/ejb-jar.xml
@@ -81,8 +81,8 @@
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
<resource-env-ref>
- <resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <resource-env-ref-type>connector.MyAdminObject</resource-env-ref-type>
+ <resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
+ <resource-env-ref-type>connector.MyAdminObject</resource-env-ref-type>
</resource-env-ref>
<security-identity>
<use-caller-identity/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/META-INF/sun-ejb-jar.xml
index de701df..913a466 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/META-INF/sun-ejb-jar.xml
@@ -84,7 +84,7 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <jndi-name>eis/testAdmin</jndi-name>
+ <jndi-name>eis/testAdmin</jndi-name>
</resource-env-ref>
<gen-classes/>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
index a7f24be..fe16187 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
@@ -44,7 +44,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean removed");
heldCon = null;
@@ -72,11 +72,11 @@
try {
synchronized (Controls.getLockObject()) {
//Tell the resource adapter the client is ready to run
- Controls.getLockObject().notifyAll();
-
+ Controls.getLockObject().notifyAll();
+
debug("NOTIFIED... START WAITING");
//Wait until being told to read from the database
- Controls.getLockObject().wait();
+ Controls.getLockObject().wait();
}
} catch (Exception ex) {
ex.printStackTrace();
@@ -84,22 +84,22 @@
}
public int getMessageCount() {
- try {
+ try {
Connection con = getFreshConnection();
int count1 = getCount(con);
con.close();
-
- /*
+
+ /*
synchronized(Controls.getLockObject()) {
Controls.getLockObject().notify();
}
- */
-
+ */
+
return count1;
} catch (Exception e) {
e.printStackTrace(System.out);
throw new EJBException(e);
- }
+ }
}
private int getCount(Connection con) throws SQLException {
@@ -125,10 +125,10 @@
Context ic = new InitialContext();
user = (String) ic.lookup("java:comp/env/user");
password = (String) ic.lookup("java:comp/env/password");
- Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
- System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
- Controls.initialize();
- System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls.initialize();
+ System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -163,7 +163,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -174,7 +174,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/build.properties
index dad207b..0b38c19 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
ejb-jar.xml=META-INF/ejb-jar.xml
sun-ejb-jar.xml=META-INF/sun-ejb-jar.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
index dd02039..5fae0f5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
@@ -46,7 +46,7 @@
* setMessageDrivenContext method, declared as public (but not final or
* static), with a return type of void, and with one argument of type
* jakarta.ejb.MessageDrivenContext.
- *
+ *
* @param mdc
* the context to set
*/
@@ -64,9 +64,9 @@
/**
* onMessage method, declared as public (but not final or static), with a
* return type of void, and with one argument of type jakarta.jms.Message.
- *
+ *
* Casts the incoming Message to a TextMessage and displays the text.
- *
+ *
* @param inMessage
* the incoming message
*/
@@ -123,14 +123,14 @@
* debug("Looked up Datasource\n");
* debug("Get JDBC connection, auto sign on"); dbConnection =
* ds.getConnection();
- *
+ *
* Statement stmt = dbConnection.createStatement(); String query
* = "SELECT id from messages where id = 'QQ'"; ResultSet
* results = stmt.executeQuery(query); results.next();
* System.out.println("QQ has balance " +
* results.getInt("balance") + " dollars"); results.close();
* stmt.close();
- *
+ *
* System.out.println("Read one account\n");
*/
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/build.xml
index ccd3fa5..db66f0a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/build.xml
@@ -48,7 +48,7 @@
<target name="runtest" depends="init-common">
<antcall target="runclient-common">
- <param name="appname" value="generic-embedded" />
+ <param name="appname" value="generic-embedded" />
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/META-INF/ra.xml
index 2ca2ebc..21deb93 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/META-INF/ra.xml
@@ -45,7 +45,7 @@
</config-property-value>
</config-property>
<inbound-resourceadapter>
- <messageadapter>
+ <messageadapter>
<messagelistener>
<messagelistener-type>
connector.MyMessageListener
@@ -56,7 +56,7 @@
</activationspec-class>
</activationspec>
</messagelistener>
- </messageadapter>
+ </messageadapter>
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>connector.MyAdminObject</adminobject-interface>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/build.xml
index ff8bcc2..8496f60 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/build.xml
@@ -30,8 +30,8 @@
<target name="all" depends="init-common" >
<antcall target="compile-common">
- <param name="build.classes.dir" value="classes" />
- <param name="src" value="connector" />
+ <param name="build.classes.dir" value="classes" />
+ <param name="src" value="connector" />
</antcall>
<jar jarfile="../generic-ra.jar" basedir="classes"
includes="connector/*.class" />
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/Controls.java
index 3541235..8aba268 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/Controls.java
@@ -17,7 +17,7 @@
package connector;
/**
- *
+ *
* @author Qingqing Ouyang
*/
public class Controls {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/DeliveryWork.java
index 0c80aa6..8c6b22f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/DeliveryWork.java
@@ -22,7 +22,7 @@
import jakarta.resource.spi.work.Work;
/**
- *
+ *
* @author Qingqing Ouyang
*/
public class DeliveryWork implements Work {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/Messages.java
index 597a34b..216dfa2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/Messages.java
@@ -21,7 +21,7 @@
/**
* collection of messages.
- *
+ *
* @author Qingqing Ouyang
*/
public class Messages {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/MyWork.java
index 6075ec4..6f5f15d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/MyWork.java
@@ -23,7 +23,7 @@
import jakarta.resource.spi.work.WorkManager;
/**
- *
+ *
* @author Qingqing Ouyang
*/
public class MyWork implements Work {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/SimpleActivationSpec.java
index 62859c8..449e245 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/SimpleActivationSpec.java
@@ -22,7 +22,7 @@
/**
* This class is supposed to implemented as a JavaBean so that the app server
* can instantiate and configure it at the runtime.
- *
+ *
* @author Qingqing Ouyang
*/
public class SimpleActivationSpec implements ActivationSpec,
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/SimpleResourceAdapterImpl.java
index 0f71b27..7a91cdf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/SimpleResourceAdapterImpl.java
@@ -35,7 +35,7 @@
/**
* This is a sample resource adapter
- *
+ *
* @author Qingqing Ouyang
*/
public class SimpleResourceAdapterImpl implements ResourceAdapter,
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/TestWMWork.java
index 6cf546e..a847b66 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/TestWMWork.java
@@ -22,7 +22,7 @@
import jakarta.resource.spi.work.WorkManager;
/**
- *
+ *
* @author Qingqing Ouyang
*/
public class TestWMWork implements Work {
@@ -33,7 +33,7 @@
private boolean doNest;
private WorkManager wm;
private ExecutionContext ctx;
-
+
public TestWMWork(int id, boolean isRogue) {
this(id, isRogue, false, null);
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/WorkDispatcher.java
index ada0a0c..879058a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/WorkDispatcher.java
@@ -32,7 +32,7 @@
import javax.transaction.xa.Xid;
/**
- *
+ *
* @author Qingqing Ouyang
*/
public class WorkDispatcher implements Work {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/XID.java
index 191b904..323190b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/src/connector/XID.java
@@ -68,7 +68,7 @@
/**
* Compute the hash code.
- *
+ *
* @return the computed hashcode
*/
public int hashCode() {
@@ -82,13 +82,13 @@
/*
* Convert to String
- *
+ *
* <p> This is normally used to display the XID when debugging.
*/
/**
* Return a string representing this XID.
- *
+ *
* @return the string representation of this XID
*/
public String toString() {
@@ -106,7 +106,7 @@
/**
* Returns the branch qualifier for this XID.
- *
+ *
* @return the branch qualifier
*/
public byte[] getBranchQualifier() {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/build.properties
index 706d46a..c97f91c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/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="cdi"/>
<property name="appname" value="${module}-no-interface-local-view-proxy-serializable"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/build.xml
index 295d086..eb790bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/build.xml
@@ -33,75 +33,75 @@
<target name="all" depends="build,create-resources,deploy,run,undeploy,delete-resources" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common" />
- <delete>
- <fileset dir="." includes="*.class" />
- <fileset dir="client/test/client" includes="*.class" />
- </delete>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete>
+ <fileset dir="." includes="*.class" />
+ <fileset dir="client/test/client" includes="*.class" />
+ </delete>
+ </target>
- <target name="compile" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="servlet" />
- </antcall>
- </target>
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="servlet" />
+ </antcall>
+ </target>
- <target name="build" depends="compile">
- <property name="hasWebclient" value="yes" />
- <antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes" />
- <param name="webclient.war.classes" value="**/*.class" />
- </antcall>
+ <target name="build" depends="compile">
+ <property name="hasWebclient" value="yes" />
+ <antcall target="webclient-war-common">
+ <param name="hasWebclient" value="yes" />
+ <param name="webclient.war.classes" value="**/*.class" />
+ </antcall>
- <javac srcdir="client" classpath="${env.APS_HOME}/lib/reportbuilder.jar" includes="test/client/WebTest.java" />
+ <javac srcdir="client" classpath="${env.APS_HOME}/lib/reportbuilder.jar" includes="test/client/WebTest.java" />
- </target>
+ </target>
- <target name="build-publish-war" depends="build, publish-war-common" />
+ <target name="build-publish-war" depends="build, publish-war-common" />
- <target name="deploy" depends="init-common">
- <antcall target="deploy-war-common" />
- </target>
+ <target name="deploy" depends="init-common">
+ <antcall target="deploy-war-common" />
+ </target>
- <target name="create-resources" depends="init-common">
- <antcall target="create-jdbc-connpool-common">
- <param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
- </antcall>
- <antcall target="create-jdbc-resource-common">
- <param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
- <param name="jdbc.resource.name" value="jdbc/jdbc-dev-test-resource" />
- </antcall>
- </target>
+ <target name="create-resources" depends="init-common">
+ <antcall target="create-jdbc-connpool-common">
+ <param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
+ </antcall>
+ <antcall target="create-jdbc-resource-common">
+ <param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
+ <param name="jdbc.resource.name" value="jdbc/jdbc-dev-test-resource" />
+ </antcall>
+ </target>
- <target name="run" depends="init-common">
- <java classname="test.client.WebTest">
- <arg value="${http.host}" />
- <arg value="${http.port}" />
- <arg value="${contextroot}" />
- <classpath>
- <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar" />
- <pathelement location="client" />
- </classpath>
- </java>
- </target>
+ <target name="run" depends="init-common">
+ <java classname="test.client.WebTest">
+ <arg value="${http.host}" />
+ <arg value="${http.port}" />
+ <arg value="${contextroot}" />
+ <classpath>
+ <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar" />
+ <pathelement location="client" />
+ </classpath>
+ </java>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common" />
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="delete-resources" depends="init-common">
- <antcall target="delete-jdbc-resource-common">
- <param name="jdbc.resource.name" value="jdbc/jdbc-dev-test-resource" />
- </antcall>
+ <target name="delete-resources" depends="init-common">
+ <antcall target="delete-jdbc-resource-common">
+ <param name="jdbc.resource.name" value="jdbc/jdbc-dev-test-resource" />
+ </antcall>
- <antcall target="delete-jdbc-connpool-common">
- <param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
- </antcall>
- </target>
+ <antcall target="delete-jdbc-connpool-common">
+ <param name="jdbc.connpool.name" value="jdbc-dev-test-pool" />
+ </antcall>
+ </target>
- <target name="usage">
- <antcall target="usage-common" />
- </target>
+ <target name="usage">
+ <antcall target="usage-common" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/TestBeanInterface.java
index 47668a4..ac42904 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/TestBeanInterface.java
@@ -19,8 +19,8 @@
public interface TestBeanInterface {
public void setState(String s);
public String getState();
-
+
public void method1();
}
-
-
+
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/nonmock/TestBean.java
index 709bf1a..2cb9aca 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/nonmock/TestBean.java
@@ -29,13 +29,13 @@
@SessionScoped
public class TestBean implements TestBeanInterface, Serializable{
public static boolean testBeanInvoked = false;
-
+
@Inject
HelloNoInterfaceLocalViewSfulEJB sfulEJB;
@Inject
HelloNoInterfaceLocalViewSlessEJB slessEJB;
-
+
@Override
public void setState(String s) {
testBeanInvoked = true;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java
index e94ddf1..bac6a9b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java
@@ -20,11 +20,11 @@
@Stateful
public class HelloNoInterfaceLocalViewSfulEJB {
-
+
private String message;
public void setState(String msg){
this.message = msg;
-
+
}
public String getState() {
return this.message;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java
index e01eee3..afc5986 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java
@@ -23,6 +23,6 @@
public void method1(String msg) {
System.out.println("Hello" + msg);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/build.properties
index e8ca782..bdb5904 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-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="cdi-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/cdi/javaee-integration/normal-bean-injection-ear/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/build.xml
index 1603605..e6a2453 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-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}/modules/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}/modules/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"/>
</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}/modules/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/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
index 97db2bd..c8862e6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
@@ -40,8 +40,8 @@
protected String myString;
private Hello singleton1;
-
- @Inject
+
+ @Inject
TestBean tw;
private String msg = "";
@@ -91,7 +91,7 @@
}
singleton1.hello();
-
+
checkForNull(tw, "normal lookup of session scoped bean in war failed");
out.println(msg);
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/build.properties
index e8ca782..bdb5904 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-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="cdi-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/cdi/javaee-integration/programmatic-lookup-ear/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/build.xml
index 1603605..e6a2453 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-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}/modules/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}/modules/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"/>
</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}/modules/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/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
index eb63768..0763763 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
@@ -40,8 +40,8 @@
protected String myString;
private Hello singleton1;
-
- @Inject
+
+ @Inject
Instance<TestBean> programmaticLookup;
private String msg = "";
@@ -91,7 +91,7 @@
}
singleton1.hello();
-
+
checkForNull(programmaticLookup.get(), "programmatic lookup of session scoped bean in war failed");
out.println(msg);
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/WebTest.java
index 7f47426..20672c8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebServlet");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -95,10 +95,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/build.properties
index ca2edae..bde04f9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/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="cdi"/>
<property name="appname" value="${module}-servlet-context-injection"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,23 +47,23 @@
</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="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}"/>
@@ -75,10 +75,10 @@
</classpath>
</java>
</target>
-
+
<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/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Destroyed.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Destroyed.java
index 61ef24a..20da90e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Destroyed.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Destroyed.java
@@ -32,5 +32,5 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface Destroyed {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Initialized.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Initialized.java
index 9a0a18e..070a289 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Initialized.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Initialized.java
@@ -32,5 +32,5 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface Initialized {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Preferred.java
index 83fe44e..b628f86 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Preferred.java
@@ -32,5 +32,5 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface Preferred {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestBean.java
index 421f836..c05e864 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestBean.java
@@ -19,12 +19,12 @@
import jakarta.inject.Inject;
import jakarta.servlet.ServletContext;
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
public class TestBean
{
@Inject
ServletContext sc;
-
+
public String m1(){
System.out.println("**********SC = " + sc.getContextPath());
return sc.getContextPath();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestServlet.java
index 2b263ac..8407179 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestServlet.java
@@ -38,9 +38,9 @@
TestBean tb;
@Inject
BeanManager bm;
-
+
BeanManager bm1;
-
+
@Inject
ServletContext sc;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/WebTest.java
index d2c69a6..cef1fc4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebServlet");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -94,10 +94,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/build.properties
index 4809e75..edd5da3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/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="cdi"/>
<property name="appname" value="${module}-simple-managed-bean-interceptor"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/build.xml
index c25e17e..eaa06bd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="WebTest.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,23 +47,23 @@
</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="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}"/>
@@ -75,10 +75,10 @@
</classpath>
</java>
</target>
-
+
<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/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/beans/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/beans/TestManagedBean.java
index 8bc8014..191f4e4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/beans/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/beans/TestManagedBean.java
@@ -16,7 +16,7 @@
package test.beans;
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
//This bean implements Serializable as it needs to be placed into a Stateful Bean
@jakarta.annotation.ManagedBean
public class TestManagedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/interceptors/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/interceptors/TestAroundInvokeInterceptor.java
index 4caaaa7..e60e071 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/interceptors/TestAroundInvokeInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/interceptors/TestAroundInvokeInterceptor.java
@@ -28,7 +28,7 @@
aroundInvokeCount = 0;
}
- @AroundInvoke
+ @AroundInvoke
public Object testMethod(InvocationContext ctx) throws Exception {
System.out.println("TestAroundInvokeIntercetpr:: aroundInvoke called - target:" + ctx.getTarget() + " , params:"+ ctx.getParameters());
aroundInvokeCount ++;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/servlet/TestServlet.java
index 173b030..df5ef2c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/servlet/TestServlet.java
@@ -70,9 +70,9 @@
int count = TestAroundInvokeInterceptor.aroundInvokeCount;
System.out.println("TestAroundInvokeInterceptor called " + count + " times");
TestAroundInvokeInterceptor.reset();
- if (count == 1) return "";
+ if (count == 1) return "";
else return "Interceptor invocation count" + count + " invalid";
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/WebTest.java
index cbd3be2..816e91b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebServlet");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -95,10 +95,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/build.properties
index 4809e75..edd5da3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/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="cdi"/>
<property name="appname" value="${module}-simple-managed-bean-interceptor"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,23 +47,23 @@
</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="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}"/>
@@ -75,10 +75,10 @@
</classpath>
</java>
</target>
-
+
<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/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/beans/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/beans/TestManagedBean.java
index 1633c1e..150e424 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/beans/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/beans/TestManagedBean.java
@@ -16,7 +16,7 @@
package test.beans;
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
//This bean implements Serializable as it needs to be placed into a Stateful Bean
@jakarta.annotation.ManagedBean
public class TestManagedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/interceptors/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/interceptors/TestAroundInvokeInterceptor.java
index 4caaaa7..e60e071 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/interceptors/TestAroundInvokeInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/interceptors/TestAroundInvokeInterceptor.java
@@ -28,7 +28,7 @@
aroundInvokeCount = 0;
}
- @AroundInvoke
+ @AroundInvoke
public Object testMethod(InvocationContext ctx) throws Exception {
System.out.println("TestAroundInvokeIntercetpr:: aroundInvoke called - target:" + ctx.getTarget() + " , params:"+ ctx.getParameters());
aroundInvokeCount ++;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/servlet/TestServlet.java
index b1e5939..7c6c1e5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/servlet/TestServlet.java
@@ -74,5 +74,5 @@
else return "Interceptor invocation count" + count + " invalid";
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/build.xml
index 210abae..d607b69 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/build.xml
@@ -36,8 +36,8 @@
<target name="all" depends="init-common, clean-common">
<ant dir="src" inheritAll="false" target="all"/>
<antcall target="ear-common">
- <param name="appname" value="simplemdb"/>
- <param name="application.xml" value="META-INF/application.xml"/>
+ <param name="appname" value="simplemdb"/>
+ <param name="application.xml" value="META-INF/application.xml"/>
</antcall>
</target>
@@ -55,7 +55,7 @@
<antcall target="execute-sql-connector">
<param name="sql.file" value="createdb.sql"/>
- </antcall>
+ </antcall>
</target>
<target name="unsetJdbc" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/META-INF/ejb-jar.xml
index 4bdcc6f..323c0ec 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/META-INF/ejb-jar.xml
@@ -91,8 +91,8 @@
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
<resource-env-ref>
- <resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <resource-env-ref-type>connector.MyAdminObject</resource-env-ref-type>
+ <resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
+ <resource-env-ref-type>connector.MyAdminObject</resource-env-ref-type>
</resource-env-ref>
<security-identity>
<use-caller-identity/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/META-INF/sun-ejb-jar.xml
index 42cd604..2753d02 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/META-INF/sun-ejb-jar.xml
@@ -36,7 +36,7 @@
TestIntegerProp
</activation-config-property-name>
<activation-config-property-value>
- 2
+ 2
</activation-config-property-value>
</activation-config-property>
</activation-config>
@@ -88,7 +88,7 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <jndi-name>eis/testAdmin</jndi-name>
+ <jndi-name>eis/testAdmin</jndi-name>
</resource-env-ref>
<gen-classes/>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
index dded454..1ed9e56 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
@@ -43,7 +43,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean removed");
heldCon = null;
@@ -71,11 +71,11 @@
try {
synchronized (Controls.getLockObject()) {
//Tell the resource adapter the client is ready to run
- Controls.getLockObject().notifyAll();
-
+ Controls.getLockObject().notifyAll();
+
debug("NOTIFIED... START WAITING");
//Wait until being told to read from the database
- Controls.getLockObject().wait();
+ Controls.getLockObject().wait();
}
} catch (Exception ex) {
ex.printStackTrace();
@@ -83,22 +83,22 @@
}
public int getMessageCount() {
- try {
+ try {
Connection con = getFreshConnection();
int count1 = getCount(con);
con.close();
-
- /*
+
+ /*
synchronized(Controls.getLockObject()) {
Controls.getLockObject().notify();
}
- */
-
+ */
+
return count1;
} catch (Exception e) {
e.printStackTrace(System.out);
throw new EJBException(e);
- }
+ }
}
private int getCount(Connection con) throws SQLException {
@@ -124,10 +124,10 @@
Context ic = new InitialContext();
user = (String) ic.lookup("java:comp/env/user");
password = (String) ic.lookup("java:comp/env/password");
- Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
- System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
- Controls.initialize();
- System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls.initialize();
+ System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -162,7 +162,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -173,7 +173,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/build.properties
index dad207b..0b38c19 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
ejb-jar.xml=META-INF/ejb-jar.xml
sun-ejb-jar.xml=META-INF/sun-ejb-jar.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/client/Client.java
index f551ce1..fdc6399 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/client/Client.java
@@ -28,45 +28,45 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public Client (String[] args) {
//super(args);
}
-
+
public static void main(String[] args) {
Client client = new Client(args);
client.doTest();
}
-
+
public String doTest() {
stat.addDescription("This is to test connector 1.5 "+
- "contracts.");
-
+ "contracts.");
+
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
res = "ALL TESTS PASSED";
- int testCount = 1;
+ int testCount = 1;
while (!done()) {
-
+
notifyAndWait();
if (!done()) {
debug("Running...");
pass = checkResults(expectedResults());
debug("Got expected results = " + pass);
-
+
//do not continue if one test failed
if (!pass) {
res = "SOME TESTS FAILED";
stat.addStatus("ID Connector 1.5 test - " + testCount, stat.FAIL);
} else {
stat.addStatus("ID Connector 1.5 test - " + testCount, stat.PASS);
- }
+ }
} else {
break;
}
- testCount ++;
+ testCount ++;
}
} catch (Exception ex) {
@@ -76,14 +76,14 @@
}
stat.printSummary("connector1.5ID");
-
+
debug("EXITING... STATUS = " + res);
return res;
}
-
+
private boolean checkResults(int num) throws Exception {
Object o = (new InitialContext()).lookup("MyMessageChecker");
- MessageCheckerHome home = (MessageCheckerHome)
+ MessageCheckerHome home = (MessageCheckerHome)
PortableRemoteObject.narrow(o, MessageCheckerHome.class);
MessageChecker checker = home.create();
int result = checker.getMessageCount();
@@ -92,7 +92,7 @@
private boolean done() throws Exception {
Object o = (new InitialContext()).lookup("MyMessageChecker");
- MessageCheckerHome home = (MessageCheckerHome)
+ MessageCheckerHome home = (MessageCheckerHome)
PortableRemoteObject.narrow(o, MessageCheckerHome.class);
MessageChecker checker = home.create();
return checker.done();
@@ -100,7 +100,7 @@
private int expectedResults() throws Exception {
Object o = (new InitialContext()).lookup("MyMessageChecker");
- MessageCheckerHome home = (MessageCheckerHome)
+ MessageCheckerHome home = (MessageCheckerHome)
PortableRemoteObject.narrow(o, MessageCheckerHome.class);
MessageChecker checker = home.create();
return checker.expectedResults();
@@ -108,7 +108,7 @@
private void notifyAndWait() throws Exception {
Object o = (new InitialContext()).lookup("MyMessageChecker");
- MessageCheckerHome home = (MessageCheckerHome)
+ MessageCheckerHome home = (MessageCheckerHome)
PortableRemoteObject.narrow(o, MessageCheckerHome.class);
MessageChecker checker = home.create();
checker.notifyAndWait();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
index effe4dc..78afabb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
@@ -39,12 +39,12 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
@jakarta.inject.Inject
private connector.TestCDIBean tb;
@@ -54,29 +54,29 @@
public MyMessageBean() {}
/**
- * setMessageDrivenContext method, declared as public (but
- * not final or static), with a return type of void, and
+ * setMessageDrivenContext method, declared as public (but
+ * not final or static), with a return type of void, and
* with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
public void setMessageDrivenContext(MessageDrivenContext mdc) {
- this.mdc = mdc;
+ this.mdc = mdc;
}
/**
- * ejbCreate method, declared as public (but not final or
- * static), with a return type of void, and with no
+ * ejbCreate method, declared as public (but not final or
+ * static), with a return type of void, and with no
* arguments.
*/
public void ejbCreate() { }
/**
- * onMessage method, declared as public (but not final or
+ * onMessage method, declared as public (but not final or
* static), with a return type of void, and with one argument
* of type jakarta.jms.Message.
*
- * Casts the incoming Message to a TextMessage and displays
+ * Casts the incoming Message to a TextMessage and displays
* the text.
*
* @param inMessage the incoming message
@@ -92,7 +92,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -108,10 +108,10 @@
}
}
-
+
/**
- * ejbRemove method, declared as public (but not final or
- * static), with a return type of void, and with no
+ * ejbRemove method, declared as public (but not final or
+ * static), with a return type of void, and with no
* arguments.
*/
public void ejbRemove() {}
@@ -121,63 +121,63 @@
java.sql.Connection dbConnection = null;
String id = message.substring(0, message.indexOf(":"));
- String body = message.substring(message.indexOf(":")+1);
+ String body = message.substring(message.indexOf(":")+1);
try {
Context ic = new InitialContext();
-
+
if ("READ".equals(op)) {
-
+
debug("Reading row from database...");
-
+
// Creating a database connection
/*
DataSource ds = (DataSource) ic.lookup("java:comp/env/MyDB");
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
dbConnection = ds.getConnection();
-
+
Statement stmt = dbConnection.createStatement();
- String query =
+ String query =
"SELECT id from messages where id = 'QQ'";
ResultSet results = stmt.executeQuery(query);
results.next();
- System.out.println("QQ has balance " +
+ System.out.println("QQ has balance " +
results.getInt("balance") + " dollars");
results.close();
stmt.close();
-
+
System.out.println("Read one account\n");
*/
} else if ("WRITE".equals(op)) {
debug("Inserting one message in the database\n");
-
+
// Creating a database connection
DataSource ds = (DataSource) ic.lookup("java:comp/env/MyDB");
//debug("Looked up Datasource\n");
//debug("Get JDBC connection, auto sign on");
dbConnection = ds.getConnection();
-
+
createRow(id, body, dbConnection);
System.out.println("Created one message\n");
-
+
} else if ("DELETE".equals(op)) {
-
+
debug("Deleting one message from the database\n");
-
+
// Creating a database connection
DataSource ds = (DataSource) ic.lookup("java:comp/env/MyDB");
//debug("Looked up Datasource\n");
//debug("Get JDBC connection, auto sign on");
dbConnection = ds.getConnection();
-
+
deleteRow(id, dbConnection);
System.out.println("Deleted one message\n");
} else if ("DELETE_ALL".equals(op)) {
-
+
debug("Deleting all messages from the database\n");
-
+
// Creating a database connection
DataSource ds = (DataSource) ic.lookup("java:comp/env/MyDB");
//debug("Looked up Datasource\n");
@@ -188,7 +188,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -197,9 +197,9 @@
}
}
}
-
- private void createRow(String id, String body,
- java.sql.Connection dbConnection)
+
+ private void createRow(String id, String body,
+ java.sql.Connection dbConnection)
throws Exception {
// Create row for this message
@@ -215,9 +215,9 @@
stmt.close();
}
- private void deleteRow(String id, java.sql.Connection dbConnection)
+ private void deleteRow(String id, java.sql.Connection dbConnection)
throws Exception {
-
+
// Delete row for this message
debug("DeleteRow with ID = " + id);
Statement stmt = dbConnection.createStatement();
@@ -230,9 +230,9 @@
stmt.close();
}
- private void deleteAll(java.sql.Connection dbConnection)
+ private void deleteAll(java.sql.Connection dbConnection)
throws Exception {
-
+
// Delete row for this message
Statement stmt = dbConnection.createStatement();
String query = "DELETE FROM messages";
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/build.xml
index 645f1c9..9231200 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/build.xml
@@ -60,7 +60,7 @@
<target name="runtest" depends="init-common">
<antcall target="runclient-common">
- <param name="appname" value="simplemdb" />
+ <param name="appname" value="simplemdb" />
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/META-INF/ra.xml
index 2ca2ebc..21deb93 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/META-INF/ra.xml
@@ -45,7 +45,7 @@
</config-property-value>
</config-property>
<inbound-resourceadapter>
- <messageadapter>
+ <messageadapter>
<messagelistener>
<messagelistener-type>
connector.MyMessageListener
@@ -56,7 +56,7 @@
</activationspec-class>
</activationspec>
</messagelistener>
- </messageadapter>
+ </messageadapter>
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>connector.MyAdminObject</adminobject-interface>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/build.xml
index fad2edb..67a0aef 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/build.xml
@@ -30,8 +30,8 @@
<target name="all" depends="init-common" >
<antcall target="compile-common">
- <param name="build.classes.dir" value="classes" />
- <param name="src" value="connector" />
+ <param name="build.classes.dir" value="classes" />
+ <param name="src" value="connector" />
</antcall>
<jar jarfile="../generic-ra.jar" basedir="classes"
includes="connector/*.class" />
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/Controls.java
index 42188a6..62e2255 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/Controls.java
@@ -18,7 +18,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class Controls {
public static Object readyLock = new Object();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/DeliveryWork.java
index f4e2ba4..6d6c720 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/DeliveryWork.java
@@ -27,7 +27,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class DeliveryWork implements Work {
@@ -36,7 +36,7 @@
private String op;
private boolean keepCount;
private static int counter = 0;
-
+
public DeliveryWork(MessageEndpoint ep, int numOfMessages, String op) {
this.ep = ep;
this.num = numOfMessages;
@@ -44,7 +44,7 @@
this.keepCount = false;
}
- public DeliveryWork(MessageEndpoint ep, int numOfMessages,
+ public DeliveryWork(MessageEndpoint ep, int numOfMessages,
String op, boolean keepCount) {
this.ep = ep;
this.num = numOfMessages;
@@ -55,7 +55,7 @@
public void run() {
debug("ENTER...");
-
+
try {
//Method onMessage = getOnMessageMethod();
//ep.beforeDelivery(onMessage);
@@ -78,11 +78,11 @@
}
//ep.afterDelivery();
-
+
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
debug("LEAVE...");
}
@@ -93,14 +93,14 @@
}
private Method getOnMessageMethod() {
-
+
Method onMessageMethod = null;
try {
Class msgListenerClass = connector.MyMessageListener.class;
Class[] paramTypes = { java.lang.String.class };
- onMessageMethod =
+ onMessageMethod =
msgListenerClass.getMethod("onMessage", paramTypes);
-
+
} catch (NoSuchMethodException ex) {
ex.printStackTrace();
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/FakeXAResource.java
index 97ed09e..292907d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/FakeXAResource.java
@@ -36,7 +36,7 @@
flagToString(flags));
}
-
+
public void forget(Xid xid) throws XAException {
print("FakeXAResource.forget: " + xidToString(xid));
}
@@ -53,7 +53,7 @@
print("FakeXAResource.prepare: " + xidToString(xid));
return XAResource.XA_OK;
}
-
+
public Xid[] recover(int flag) throws XAException {
print("FakeXAResource.recover: " + flagToString(flag));
return null;
@@ -66,7 +66,7 @@
public boolean setTransactionTimeout(int seconds) throws XAException {
return false;
}
-
+
public void start(Xid xid, int flags) throws XAException {
print("FakeXAResource.start: " + xidToString(xid) + "," +
flagToString(flags));
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/Messages.java
index 84e1c71..84746d4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/Messages.java
@@ -21,7 +21,7 @@
/**
* collection of messages.
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class Messages {
@@ -54,7 +54,7 @@
String command = args[0];
String destName = args[1];
String message = args[2];
-
+
if (!"add".equals(command)) {
System.exit(1);
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/MyAdminObject.java
index f33a711..d77b485 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/MyAdminObject.java
@@ -38,11 +38,11 @@
}
public void initialize() {
- System.out.println("[MyAdminObject] Initializing the Controls to false:"+resetControl);
+ System.out.println("[MyAdminObject] Initializing the Controls to false:"+resetControl);
if (resetControl.equals("BEGINNING")) {
Controls.done=false;
- System.out.println("[MyAdminObject] Initialized the Controls to false");
- }
+ System.out.println("[MyAdminObject] Initialized the Controls to false");
+ }
}
public boolean done() {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/MyWork.java
index 61588ec..f204240 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/MyWork.java
@@ -27,7 +27,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class MyWork implements Work {
@@ -35,7 +35,7 @@
private boolean stop = false;
private MessageEndpointFactory factory;
private WorkManager wm;
-
+
public MyWork(
String name, MessageEndpointFactory factory, WorkManager wm) {
this.factory = factory;
@@ -53,7 +53,7 @@
try {
Method onMessage = getOnMessageMethod();
- System.out.println("isDeliveryTransacted = " +
+ System.out.println("isDeliveryTransacted = " +
factory.isDeliveryTransacted(onMessage));
/*
@@ -70,7 +70,7 @@
ex.printStackTrace();
}
}
-
+
debug("LEAVE...");
}
@@ -85,14 +85,14 @@
}
public Method getOnMessageMethod() {
-
+
Method onMessageMethod = null;
try {
Class msgListenerClass = connector.MyMessageListener.class;
Class[] paramTypes = { java.lang.String.class };
- onMessageMethod =
+ onMessageMethod =
msgListenerClass.getMethod("onMessage", paramTypes);
-
+
} catch (NoSuchMethodException ex) {
ex.printStackTrace();
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/SimpleActivationSpec.java
index fa9983f..5be653c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/SimpleActivationSpec.java
@@ -24,9 +24,9 @@
* so that the app server can instantiate and configure
* it at the runtime.
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
-public class SimpleActivationSpec
+public class SimpleActivationSpec
implements ActivationSpec, java.io.Serializable {
private String destinationName;
@@ -43,7 +43,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -52,7 +52,7 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
@@ -61,7 +61,7 @@
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -70,7 +70,7 @@
public Integer getTestIntegerProp() {
return this.testIntegerProp;
}
-
+
public void setTestIntegerProp (Integer testProp1) {
debug("setTestIntegerProp () called... testIntegerProp = " + testProp1);
this.testIntegerProp = testProp1;
@@ -94,7 +94,7 @@
}
- }
+ }
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/SimpleResourceAdapterImpl.java
index 577889d..4b500bc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/SimpleResourceAdapterImpl.java
@@ -40,9 +40,9 @@
/**
* This is a sample resource adapter
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
-public class SimpleResourceAdapterImpl
+public class SimpleResourceAdapterImpl
implements ResourceAdapter, java.io.Serializable {
private BootstrapContext ctx;
@@ -58,7 +58,7 @@
public void
start(BootstrapContext ctx) throws ResourceAdapterInternalException{
-
+
debug("001. Simple RA start...");
this.ctx = ctx;
@@ -68,21 +68,21 @@
//testing creat timer
Timer timer = null;
- try{
- timer = ctx.createTimer();
- } catch(UnavailableException ue) {
- System.out.println("Error");
- throw new ResourceAdapterInternalException("Error form bootstrap");
- }
+ try{
+ timer = ctx.createTimer();
+ } catch(UnavailableException ue) {
+ System.out.println("Error");
+ throw new ResourceAdapterInternalException("Error form bootstrap");
+ }
debug("004. Simple RA start...");
try {
-
+
XATerminator xa = ctx.getXATerminator();
-
+
Xid xid1 = new XID();
System.out.println(" XID1 = " + xid1);
-
+
ExecutionContext ec = new ExecutionContext();
ec.setXid(xid1);
ec.setTransactionTimeout(5*1000); //5 seconds
@@ -92,14 +92,14 @@
wm.doWork(outw, 1*1000, ec, null);
xa.commit(xid1, true);
} catch (Exception ex) {
-
+
System.out.println(" ex = " + ex.getMessage());
xa.rollback(xid1);
}
-
+
Xid xid2 = new XID();
System.out.println(" XID2 = " + xid2);
-
+
ec = new ExecutionContext();
ec.setXid(xid2);
ec.setTransactionTimeout(5*1000); //5 seconds
@@ -116,7 +116,7 @@
ex.printStackTrace();
}
-
+
for (int i = 0 ; i < 3; i++) {
TestWMWork w = new TestWMWork(i, false);
try {
@@ -124,7 +124,7 @@
} catch (Exception ex) {
System.out.println("FAIL: CAUGHT exception : i = " + i);
ex.printStackTrace();
- }
+ }
}
for (int i = 3 ; i < 6; i++) {
@@ -172,7 +172,7 @@
ex.printStackTrace();
}
}
-
+
debug("005. Simple RA start...");
}
@@ -206,13 +206,13 @@
public void
endpointDeactivation (
- MessageEndpointFactory endpointFactory,
+ MessageEndpointFactory endpointFactory,
ActivationSpec spec) {
debug ("endpointDeactivation called...");
-
+
((WorkDispatcher) work).stop();
}
-
+
public String getTestName() {
return testName;
}
@@ -228,7 +228,7 @@
System.out.println("[SimpleResourceAdapterImpl] ==> " + message);
}
- public XAResource[] getXAResources(ActivationSpec[] specs)
+ public XAResource[] getXAResources(ActivationSpec[] specs)
throws ResourceException {
throw new UnsupportedOperationException();
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/TestWMWork.java
index 47fdede..d336cb5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/TestWMWork.java
@@ -28,7 +28,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class TestWMWork implements Work {
@@ -42,8 +42,8 @@
public TestWMWork(int id, boolean isRogue) {
this(id, isRogue, false, null);
}
-
- public TestWMWork(int id, boolean isRogue,
+
+ public TestWMWork(int id, boolean isRogue,
boolean doNest, ExecutionContext ctx) {
this.id = id;
this.isRogue = isRogue;
@@ -77,10 +77,10 @@
} catch (WorkException ex) {
if (ex.getErrorCode().equals(
WorkException.TX_CONCURRENT_WORK_DISALLOWED)) {
- System.out.println("TestWMWork[" + id + "] " +
+ System.out.println("TestWMWork[" + id + "] " +
"PASS: CAUGHT EXPECTED = " + ex.getErrorCode());
} else {
- System.out.println("TestWMWork[" + id + "] " +
+ System.out.println("TestWMWork[" + id + "] " +
"FAIL: CAUGHT UNEXPECTED = " + ex.getErrorCode());
}
}
@@ -92,7 +92,7 @@
ec.setTransactionTimeout(5*1000); //5 seconds
wm.doWork(nestedWork, 1*1000, ec, null);
} catch (Exception ex) {
- System.out.println("TestWMWork[" + id + "] " +
+ System.out.println("TestWMWork[" + id + "] " +
"FAIL: CAUGHT UNEXPECTED = " + ex.getMessage());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/WorkDispatcher.java
index 9a059fe..fa032ef 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/WorkDispatcher.java
@@ -33,7 +33,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class WorkDispatcher implements Work {
@@ -44,11 +44,11 @@
private ActivationSpec spec;
private WorkManager wm;
private XATerminator xa;
-
+
public WorkDispatcher(
String id,
BootstrapContext ctx,
- MessageEndpointFactory factory,
+ MessageEndpointFactory factory,
ActivationSpec spec) {
this.id = id;
this.ctx = ctx;
@@ -61,7 +61,7 @@
public void run() {
debug("ENTER...");
-
+
try {
synchronized (Controls.readyLock) {
debug("WAIT...");
@@ -83,26 +83,26 @@
try {
Method onMessage = getOnMessageMethod();
- System.out.println("isDeliveryTransacted = " +
+ System.out.println("isDeliveryTransacted = " +
factory.isDeliveryTransacted(onMessage));
if (!factory.isDeliveryTransacted(onMessage)) {
//MessageEndpoint ep = factory.createEndpoint(null);
- //DeliveryWork d = new DeliveryWork("NO_TX", ep);
+ //DeliveryWork d = new DeliveryWork("NO_TX", ep);
//wm.doWork(d, 0, null, null);
} else {
-
+
//MessageEndpoint ep = factory.createEndpoint(null);
MessageEndpoint ep = factory.createEndpoint(new FakeXAResource());
int numOfMessages = 5;
-
+
//importing transaction
//write/commit
ExecutionContext ec = startTx();
debug("Start TX - " + ec.getXid());
- DeliveryWork w =
+ DeliveryWork w =
new DeliveryWork(ep, numOfMessages, "WRITE");
wm.doWork(w, 0, ec, null);
xa.commit(ec.getXid(), true);
@@ -110,7 +110,7 @@
debug("DONE WRITE TO DB");
Controls.expectedResults = numOfMessages;
notifyAndWait();
-
+
//delete/rollback
ec = startTx();
debug("Start TX - " + ec.getXid());
@@ -126,7 +126,7 @@
//delete/commit
ec = startTx();
debug("Start TX - " + ec.getXid());
-
+
w = new DeliveryWork(ep, numOfMessages, "DELETE");
wm.doWork(w, 0, ec, null);
xa.commit(ec.getXid(), true);
@@ -150,7 +150,7 @@
//delete/commit
ec = startTx();
debug("Start TX - " + ec.getXid());
-
+
w = new DeliveryWork(ep, numOfMessages, "DELETE");
wm.doWork(w, 0, ec, null);
xa.commit(ec.getXid(), true);
@@ -195,7 +195,7 @@
wm.doWork(w, 0, ec, null);
wm.doWork(w, 0, ec, null);
wm.doWork(w, 0, ec, null);
-
+
if (XAResource.XA_OK == xa.prepare(ec.getXid())) {
xa.commit(ec.getXid(), false);
debug("XA PREPARE/COMMIT. DONE WRITE TO DB ");
@@ -207,19 +207,19 @@
Controls.expectedResults = 3;
notifyAndWait();
}
-
+
//delete all.
ec = startTx();
debug("Start TX - " + ec.getXid());
-
+
w = new DeliveryWork(ep, 1, "DELETE_ALL");
wm.doWork(w, 0, ec, null);
xa.commit(ec.getXid(), true);
-
+
debug("DONE DELETE ALL FROM DB");
Controls.expectedResults = 0;
notifyAndWait();
-
+
done();
}
@@ -243,7 +243,7 @@
break;
}
}
-
+
debug("LEAVE...");
}
@@ -258,14 +258,14 @@
}
public Method getOnMessageMethod() {
-
+
Method onMessageMethod = null;
try {
Class msgListenerClass = connector.MyMessageListener.class;
Class[] paramTypes = { java.lang.String.class };
- onMessageMethod =
+ onMessageMethod =
msgListenerClass.getMethod("onMessage", paramTypes);
-
+
} catch (NoSuchMethodException ex) {
ex.printStackTrace();
}
@@ -288,13 +288,13 @@
try {
//Sleep for 5 seconds
//Thread.currentThread().sleep(5*1000);
-
+
synchronized(Controls.readyLock) {
//Notify the client to check the results
- Controls.readyLock.notify();
-
+ Controls.readyLock.notify();
+
//Wait until results are verified by the client
- Controls.readyLock.wait();
+ Controls.readyLock.wait();
if (stop) {
return;
@@ -310,7 +310,7 @@
Controls.done = true;
synchronized(Controls.readyLock) {
//Notify the client to check the results
- Controls.readyLock.notify();
+ Controls.readyLock.notify();
}
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/XID.java
index 138e91b..28c17ed 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/src/connector/XID.java
@@ -36,8 +36,8 @@
public int branchQualifier;
public int globalTxID;
- static public final int MAXGTRIDSIZE= 64;
- static public final int MAXBQUALSIZE= 64;
+ static public final int MAXGTRIDSIZE= 64;
+ static public final int MAXBQUALSIZE= 64;
public XID() {
int foo = ID++;
@@ -55,10 +55,10 @@
{
return false; // It can't be equal
}
-
+
other = (XID)o; // The other XID, now properly cast
-
- if (this.formatID == other.formatID
+
+ if (this.formatID == other.formatID
&& this.branchQualifier == other.branchQualifier
&& this.globalTxID == other.globalTxID) {
return true;
@@ -98,7 +98,7 @@
"formatID(" + formatID + "), " +
"branchQualifier (" + branchQualifier + "), " +
"globalTxID(" + globalTxID + ")}");
-
+
return s;
}
