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/alternatives/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/alternatives/WebTest.java
index 4505147..5110b86 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/alternatives/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/alternatives/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Testing Alternatives");
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);
@@ -96,10 +96,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/alternatives/build.properties b/appserver/tests/appserv-tests/devtests/cdi/alternatives/build.properties
index 317b372..96f42ed 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/alternatives/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/alternatives/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-alternatives"/>
<property name="appname" value="${module}-servlet-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/alternatives/build.xml b/appserver/tests/appserv-tests/devtests/cdi/alternatives/build.xml
index c0d904d..872f366 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/alternatives/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/alternatives/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/ambiguous-deps/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/WebTest.java
index 844c2a8..486bcae 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Testing Ambiguous dependencies");
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);
@@ -96,10 +96,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/ambiguous-deps/build.properties b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/build.properties
index 2b73b98..eb4315e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/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-ambiguousdeps"/>
<property name="appname" value="${module}-servlet-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/build.xml b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/build.xml
index c0d904d..872f366 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/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/ambiguous-deps/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/descriptor/beans.xml
index 19f070f..f05f901 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/descriptor/beans.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/descriptor/beans.xml
@@ -23,11 +23,11 @@
<alternatives>
<class>test.artifacts.MockPaymentProcessor</class>
<!-- DisabledMockPaymentProcessor is not enabled -->
- <!--
+ <!--
<class>test.artifacts.DisabledMockPaymentProcessor</class>
-->
-
+
<!-- MockCashReliablePaymentProcessor and MockChequePaymentProcessor are not enabled -->
</alternatives>
-
+
</beans>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/build.xml b/appserver/tests/appserv-tests/devtests/cdi/build.xml
index ccec574..6005ad1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/build.xml
@@ -30,7 +30,7 @@
&commonBuild;
&commonRun;
&reporting;
-
+
<property name="cdi-target" value="all" />
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
@@ -178,12 +178,12 @@
<ant dir="qualifiers" target="${cdi-target}" />
<!--
- Not running until https://issues.jboss.org/browse/CDI-331 is sorted out.
- In 1.1.10.Final the test passes.
- In 2.0 Beta it fails.
- See email from Jozef 3/4/13
- <ant dir="alternatives" target="${cdi-target}"/>
- <ant dir="ambiguous-deps" target="${cdi-target}"/>
+ Not running until https://issues.jboss.org/browse/CDI-331 is sorted out.
+ In 1.1.10.Final the test passes.
+ In 2.0 Beta it fails.
+ See email from Jozef 3/4/13
+ <ant dir="alternatives" target="${cdi-target}"/>
+ <ant dir="ambiguous-deps" target="${cdi-target}"/>
-->
<echo message="Running events" />
@@ -211,11 +211,11 @@
<ant dir="producer-methods" target="${cdi-target}" />
<!--
- Not running until https://issues.jboss.org/browse/CDI-331 is sorted out.
- In 1.1.10.Final the test passes.
- In 2.0 Beta it fails.
- See email from Jozef 3/4/13
- <ant dir="programmatic-lookup" target="${cdi-target}"/>
+ Not running until https://issues.jboss.org/browse/CDI-331 is sorted out.
+ In 1.1.10.Final the test passes.
+ In 2.0 Beta it fails.
+ See email from Jozef 3/4/13
+ <ant dir="programmatic-lookup" target="${cdi-target}"/>
-->
<echo message="Running scopes" />
@@ -246,7 +246,7 @@
</then>
<else>
<!--
- Not running until figherfish is back
+ Not running until figherfish is back
-->
<!--
<ant dir="osgi-cdi" target="${cdi-target}"/>
@@ -264,16 +264,16 @@
<target name="usage">
<echo> Usage:
- ant cdi (Executes the cdi tests)
- ant all (Executes all the cdi tests)
- ant clean (cleans all the cdi tests)
- ant build (builds all the cdi tests)
- ant setup (sets up all resources for cdi tests)
- ant deploy (deploys all the cdi apps)
- ant run (Executes all the cdi tests)
- ant undeploy (undeploys all the cdi apps)
- ant unsetup (unsets all resources for cdi tests)
- </echo>
+ ant cdi (Executes the cdi tests)
+ ant all (Executes all the cdi tests)
+ ant clean (cleans all the cdi tests)
+ ant build (builds all the cdi tests)
+ ant setup (sets up all resources for cdi tests)
+ ant deploy (deploys all the cdi apps)
+ ant run (Executes all the cdi tests)
+ ant undeploy (undeploys all the cdi apps)
+ ant unsetup (unsets all resources for cdi tests)
+ </echo>
</target>
<target name="report-local">
diff --git a/appserver/tests/appserv-tests/devtests/cdi/config/database.xml b/appserver/tests/appserv-tests/devtests/cdi/config/database.xml
index d4d1fb0..5a58312 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/config/database.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/config/database.xml
@@ -28,16 +28,16 @@
<!--
<project name="oracle-db-settings" default="create-jdbc-conpool-connector" basedir=".">
-&common;
+&common;
&testcommon;
-->
<target name="create-jdbc-conpool-connector" depends="default-jdbc-conpool, oracle-jdbc-conpool"/>
<target name="default-jdbc-conpool" depends="init-common" unless="oracle">
- <antcall target="create-jdbc-connpool-common"/>
+ <antcall target="create-jdbc-connpool-common"/>
</target>
-
+
<target name="oracle-jdbc-conpool" depends="init-common" if="oracle">
<echo message="creating jdbc connection pool ${jdbc.conpool.name}"
level="verbose"/>
@@ -50,12 +50,12 @@
<arg line="${jdbc.conpool.name}"/>
</exec>
<antcall target="set-oracle-props">
- <param name="pool.type" value="jdbc"/>
- <param name="conpool.name" value="${jdbc.conpool.name}"/>
+ <param name="pool.type" value="jdbc"/>
+ <param name="conpool.name" value="${jdbc.conpool.name}"/>
</antcall>
</target>
-<target name="set-oracle-props" depends="init-common" if="oracle">
+<target name="set-oracle-props" depends="init-common" if="oracle">
<property file="${env.APS_HOME}/devtests/connector/config/oracle.properties"/>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -97,15 +97,15 @@
<target name="execute-sql-connector" depends="init-common, default-sql, sql-oracle"/>
-<target name="default-sql" depends="init-common" unless="oracle" >
- <antcall target="execute-sql-common"/>
+<target name="default-sql" depends="init-common" unless="oracle" >
+ <antcall target="execute-sql-common"/>
</target>
<target name="sql-oracle" depends="init-common" if="oracle">
- <property file="${env.APS_HOME}/devtests/connector/config/oracle.properties"/>
- <property name="domain.lib.ext" value="${env.S1AS_HOME}/domains/domain1/lib/ext"/>
- <property name="oracle.driver.path" value="${domain.lib.ext}/smoracle.jar:${domain.lib.ext}/smbase.jar:${domain.lib.ext}/smresource.jar:${domain.lib.ext}/smutil.jar:${domain.lib.ext}/smspy.jar:${domain.lib.ext}/Oranxo.jar"/>
- <echo message="${oracleForConnector.driver}"/>
+ <property file="${env.APS_HOME}/devtests/connector/config/oracle.properties"/>
+ <property name="domain.lib.ext" value="${env.S1AS_HOME}/domains/domain1/lib/ext"/>
+ <property name="oracle.driver.path" value="${domain.lib.ext}/smoracle.jar:${domain.lib.ext}/smbase.jar:${domain.lib.ext}/smresource.jar:${domain.lib.ext}/smutil.jar:${domain.lib.ext}/smspy.jar:${domain.lib.ext}/Oranxo.jar"/>
+ <echo message="${oracleForConnector.driver}"/>
<echo message="Executing sql statement at ${basedir} from ${sql.file}"
level="verbose"/>
<sql
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/build.xml b/appserver/tests/appserv-tests/devtests/cdi/decorators/build.xml
index 823b1b1..b1883c8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/build.xml
@@ -82,15 +82,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the decorators tests)
- ant clean (cleans all the decorators tests)
- ant build (builds all the decorators tests)
- ant setup (sets up all resources for decorators tests)
- ant deploy (deploys all the decorators apps)
- ant run (Executes all the decorators tests)
- ant undeploy (undeploys all the decorators apps)
- ant unsetup (unsets all resources for decorators tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the decorators tests)
+ ant clean (cleans all the decorators tests)
+ ant build (builds all the decorators tests)
+ ant setup (sets up all resources for decorators tests)
+ ant deploy (deploys all the decorators apps)
+ ant run (Executes all the decorators tests)
+ ant undeploy (undeploys all the decorators apps)
+ ant unsetup (unsets all resources for decorators tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/build.properties b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/build.properties
index 581be99..c2ff244 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="cdi"/>
<property name="appname" value="${module}-decorator-for-beeans-from-producer-methods"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/build.xml b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/decorators/decorators-over-beans-from-producer-methods/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/client/test/client/WebTest.java
index d445b69..e428603 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/client/test/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -59,7 +59,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -98,10 +98,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/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanDecorator.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanDecorator.java
index 3c9f84f..7d66381 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanDecorator.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanDecorator.java
@@ -22,9 +22,9 @@
@Decorator
public abstract class TestBeanDecorator implements TestBeanInterface{
-
+
public static boolean decoratorCalled = false;
-
+
@Inject
@Delegate
@ProducedAtRuntime
@@ -36,7 +36,7 @@
decoratorCalled = true;
return tb.m1();
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/servlet/TestDecorationOfBeansFromProducerMethodsTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/servlet/TestDecorationOfBeansFromProducerMethodsTestServlet.java
index 172a7e3..5890153 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/servlet/TestDecorationOfBeansFromProducerMethodsTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/servlet/TestDecorationOfBeansFromProducerMethodsTestServlet.java
@@ -35,7 +35,7 @@
@Inject
@ProducedAtRuntime
TestBeanInterface tb;
-
+
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
@@ -49,7 +49,7 @@
tb.m1();
if (!TestBeanDecorator.decoratorCalled)
msg += "decorator for beans from producer methods not called";
-
+
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/build.properties b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/build.properties
index 5d45b07..855d477 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/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-decorator"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/build.xml b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/decorators/simple-decorator/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/client/test/client/WebTest.java
index 0a194c9..e85c55c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/client/test/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -59,7 +59,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -98,10 +98,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/decorators/simple-decorator/servlet/test/beans/LargeTransactionDecorator.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/LargeTransactionDecorator.java
index f54e7bf..e3123bd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/LargeTransactionDecorator.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/LargeTransactionDecorator.java
@@ -27,7 +27,7 @@
public static boolean withDrawCalled = false;
public static boolean depositCalled = false;
- @Inject @Delegate
+ @Inject @Delegate
Account account;
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/RequiresNewTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/RequiresNewTransactionInterceptor.java
index e626a37..c030604 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/RequiresNewTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/RequiresNewTransactionInterceptor.java
@@ -28,10 +28,10 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("RequiresNewTransactionInterceptor::AroundInvoke");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/ShoppingCart.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/ShoppingCart.java
index 60a8a40..f8c9a8a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/ShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/ShoppingCart.java
@@ -20,10 +20,10 @@
@Transactional(requiresNew=true)
@Preferred
public class ShoppingCart {
-
+
public void addItem(String s) {
System.out.println("ShoppingCart::addItem called");
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TestAccount.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TestAccount.java
index 066e62b..141d765 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TestAccount.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TestAccount.java
@@ -24,7 +24,7 @@
@Override
public void deposit(BigDecimal amount) {
System.out.println("TestAccount::deposit+" + amount);
-
+
//get a bonus of 5
currentBal = currentBal.add(amount.add(new BigDecimal(5)));
System.out.println("new bal:" + currentBal);
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TransactionInterceptor.java
index afdc156..e1d0d52 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TransactionInterceptor.java
@@ -27,15 +27,15 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/servlet/SimpleDecoratorTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/servlet/SimpleDecoratorTestServlet.java
index 897cab3..0d91542 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/servlet/SimpleDecoratorTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/servlet/SimpleDecoratorTestServlet.java
@@ -40,11 +40,11 @@
@Inject
@Preferred
TestBean tb;
-
+
@Inject
@Preferred
ShoppingCart sc;
-
+
@Inject
Account testAccount;
@@ -69,51 +69,51 @@
+ TransactionInterceptor.aroundInvokeInvocationCount;
if (!TransactionInterceptor.errorMessage.trim().equals(""))
msg += TransactionInterceptor.errorMessage;
-
+
if (RequiresNewTransactionInterceptor.aroundInvokeCalled)
msg += "RequiresNew TransactionInterceptor called when " +
- "it shouldn't have been called";
-
+ "it shouldn't have been called";
+
TransactionInterceptor.clear();
//invoke shopping cart bean. This should result in an invocation on
//the RequiresNewTransactional
sc.addItem("Test Item");
if (!RequiresNewTransactionInterceptor.aroundInvokeCalled)
msg += "Business method interceptor aroundInvoke in requires new " +
- "transaction interceptor not called";
+ "transaction interceptor not called";
if (RequiresNewTransactionInterceptor.aroundInvokeInvocationCount != 1)
msg += "Business method requires new interceptor invocation on " +
- "method-level interceptor annotation count not expected. "
+ "method-level interceptor annotation count not expected. "
+ "expected =1, actual="
+ RequiresNewTransactionInterceptor.aroundInvokeInvocationCount;
if (!RequiresNewTransactionInterceptor.errorMessage.trim().equals(""))
msg += RequiresNewTransactionInterceptor.errorMessage;
-
+
//TransactionInterceptor should not have been called
if (TransactionInterceptor.aroundInvokeCalled)
msg += "TranscationInterceptor aroundInvoke called when a requiresnew" +
- "transaction interceptor should have been called";
-
+ "transaction interceptor should have been called";
+
//Test decorators
System.out.println(testAccount.getBalance());
- if (testAccount.getBalance().compareTo(new BigDecimal(100)) != 0)
+ if (testAccount.getBalance().compareTo(new BigDecimal(100)) != 0)
msg += "Decorators:Invalid initial balance";
-
+
testAccount.deposit(new BigDecimal(10));
if (testAccount.getBalance().compareTo(new BigDecimal(115)) != 0) //5 as bonus by the decorator
msg += "Decorators:Invalid balance after deposit";
-
-
+
+
testAccount.withdraw(new BigDecimal(10));
if (testAccount.getBalance().compareTo(new BigDecimal(105)) != 0)
msg += "Decorators:Invalid balance after withdrawal";
-
+
if (!LargeTransactionDecorator.depositCalled)
msg += "deposit method in Decorator not called";
if (!LargeTransactionDecorator.withDrawCalled)
msg += "deposit method in Decorator not called";
-
+
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/build.xml b/appserver/tests/appserv-tests/devtests/cdi/events/build.xml
index 63beb4a..18134cf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/build.xml
@@ -87,15 +87,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the events tests)
- ant clean (cleans all the events tests)
- ant build (builds all the events tests)
- ant setup (sets up all resources for events tests)
- ant deploy (deploys all the events apps)
- ant run (Executes all the events tests)
- ant undeploy (undeploys all the events apps)
- ant unsetup (unsets all resources for events tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the events tests)
+ ant clean (cleans all the events tests)
+ ant build (builds all the events tests)
+ ant setup (sets up all resources for events tests)
+ ant deploy (deploys all the events apps)
+ ant run (Executes all the events tests)
+ ant undeploy (undeploys all the events apps)
+ ant unsetup (unsets all resources for events tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/build.properties b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/build.properties
index aaa9202..62d842e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/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}-event-producers"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/build.xml b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/events/conditional-observer/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/client/test/client/WebTest.java
index 1ea454b..1924197 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/client/test/client/WebTest.java
@@ -27,7 +27,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String TEST_NAME =
+ private static final String TEST_NAME =
"events-conditional-observers";
private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -99,10 +99,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/events/conditional-observer/servlet/test/beans/Document.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Document.java
index d857f5a..0cbf7e7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Document.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Document.java
@@ -22,7 +22,7 @@
System.out.println("Document created with name" + name );
this.name = name;
}
-
+
public void update(){
System.out.println("Document:" + name + " updated.");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/SecondTestEventConditionalObserver.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/SecondTestEventConditionalObserver.java
index 9698f2a..bedb1f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/SecondTestEventConditionalObserver.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/SecondTestEventConditionalObserver.java
@@ -27,7 +27,7 @@
public static int documentCreatedEvent = 0;
//should not get called as there is no conversation is in this test
- public void onDocumentCreate(@Observes(notifyObserver=Reception.IF_EXISTS)
+ public void onDocumentCreate(@Observes(notifyObserver=Reception.IF_EXISTS)
@Created Document d) {
System.out.println("TestEventObserver:onDocumentCreate");
documentCreatedEvent++;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventConditionalObserver.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventConditionalObserver.java
index e690ca0..a224fbc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventConditionalObserver.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventConditionalObserver.java
@@ -41,12 +41,12 @@
System.out.println("TestEventObserver:afterDocumentUpdate");
documentUpdatedEvent++;
}
-
+
public void onDocumentUpdatedAndApproved(
@Observes @Updated @Approved Document d){
System.out.println("TestEventObserver:updated and approved");
documentApprovedEvents++;
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventProducer.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventProducer.java
index bb6c1be..1df4cca 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventProducer.java
@@ -22,24 +22,24 @@
public class TestEventProducer {
@Inject Event<Document> docEvent;
-
+
public void fireEvents(){
Document d = new Document("Test");
docEvent.fire(d); //general fire of a Document related event
-
+
//send a created event
docEvent.select(
new AnnotationLiteral<Created>(){}).fire(d);
-
-
+
+
d.update();
//send an updated event
docEvent.select(
new AnnotationLiteral<Updated>(){}).fire(d);
-
+
//send an updated and approved event
docEvent.select(new AnnotationLiteral<Updated>(){}, new AnnotationLiteral<Approved>(){}).fire(d);
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/servlet/ConditionalObserverTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/servlet/ConditionalObserverTestServlet.java
index a8e4f0e..eed747e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/servlet/ConditionalObserverTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/servlet/ConditionalObserverTestServlet.java
@@ -48,25 +48,25 @@
if (TestEventConditionalObserver.documentCreatedEvent != 1){
msg += "Document created event not received by observer";
}
-
+
if (TestEventConditionalObserver.documentUpdatedEvent != 2){
msg += "Document updated event not received by observer";
}
-
+
if (TestEventConditionalObserver.documentApprovedEvents != 1){
msg += "Document updated and approved event not " +
- "received by observer";
+ "received by observer";
}
-
+
if (TestEventConditionalObserver.documentAnyEvents != 4){
msg += "# of Document event received by observer does not " +
- "match expected values. expected = 2. observed="+ TestEventConditionalObserver.documentAnyEvents;
+ "match expected values. expected = 2. observed="+ TestEventConditionalObserver.documentAnyEvents;
}
-
- if (SecondTestEventConditionalObserver.documentCreatedEvent > 0)
+
+ if (SecondTestEventConditionalObserver.documentCreatedEvent > 0)
msg += "A conditional observer was notified when it did not exist";
-
-
+
+
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/build.properties b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/build.properties
index aaa9202..62d842e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/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}-event-producers"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/build.xml b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/events/event-producers/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/client/test/client/WebTest.java
index 5d6b503..e369306 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/client/test/client/WebTest.java
@@ -27,7 +27,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String TEST_NAME =
+ private static final String TEST_NAME =
"events-simple-event-producer";
private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -99,10 +99,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/events/event-producers/servlet/test/beans/Document.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Document.java
index d857f5a..0cbf7e7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Document.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Document.java
@@ -22,7 +22,7 @@
System.out.println("Document created with name" + name );
this.name = name;
}
-
+
public void update(){
System.out.println("Document:" + name + " updated.");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventObserver.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventObserver.java
index 60a0b83..4687e64 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventObserver.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventObserver.java
@@ -38,12 +38,12 @@
System.out.println("TestEventObserver:afterDocumentUpdate");
documentUpdatedEvent++;
}
-
+
public void onDocumentUpdatedAndApproved(
@Observes @Updated @Approved Document d){
System.out.println("TestEventObserver:updated and approved");
documentApprovedEvents++;
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventProducer.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventProducer.java
index bb6c1be..1df4cca 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventProducer.java
@@ -22,24 +22,24 @@
public class TestEventProducer {
@Inject Event<Document> docEvent;
-
+
public void fireEvents(){
Document d = new Document("Test");
docEvent.fire(d); //general fire of a Document related event
-
+
//send a created event
docEvent.select(
new AnnotationLiteral<Created>(){}).fire(d);
-
-
+
+
d.update();
//send an updated event
docEvent.select(
new AnnotationLiteral<Updated>(){}).fire(d);
-
+
//send an updated and approved event
docEvent.select(new AnnotationLiteral<Updated>(){}, new AnnotationLiteral<Approved>(){}).fire(d);
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/servlet/SimpleEventObserverTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/servlet/SimpleEventObserverTestServlet.java
index 57e8c3b..708ea46 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/servlet/SimpleEventObserverTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/servlet/SimpleEventObserverTestServlet.java
@@ -47,20 +47,20 @@
if (TestEventObserver.documentCreatedEvent != 1){
msg += "Document created event not received by observer";
}
-
+
if (TestEventObserver.documentUpdatedEvent != 2){
msg += "Document updated event not received by observer";
}
-
+
if (TestEventObserver.documentApprovedEvents != 1){
msg += "Document updated and approved event not " +
- "received by observer";
+ "received by observer";
}
-
-
+
+
if (TestEventObserver.documentAnyEvents != 4){
msg += "# of Document event received by observer does not " +
- "match expected values. expected = 2. observed="+ TestEventObserver.documentAnyEvents;
+ "match expected values. expected = 2. observed="+ TestEventObserver.documentAnyEvents;
}
writer.write(msg + "\n");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/build.properties b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/build.properties
index aaa9202..62d842e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/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}-event-producers"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/build.xml b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/events/event-qualifiers-with-members/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/client/test/client/WebTest.java
index ded1d20..ce25b1e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/client/test/client/WebTest.java
@@ -27,7 +27,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String TEST_NAME =
+ private static final String TEST_NAME =
"events-event-qualifiers-with-members";
private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -99,10 +99,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/events/event-qualifiers-with-members/servlet/test/beans/Document.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Document.java
index d857f5a..0cbf7e7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Document.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Document.java
@@ -22,7 +22,7 @@
System.out.println("Document created with name" + name );
this.name = name;
}
-
+
public void update(){
System.out.println("Document:" + name + " updated.");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventProducer.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventProducer.java
index b9ed6d3..b399a74 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventProducer.java
@@ -22,27 +22,27 @@
public class TestEventProducer {
@Inject Event<Document> docEvent;
-
+
@Inject @Updated(updatedBy="admin") Event<Document> updatedByAdminEvent;
-
+
public void fireEvents(){
Document d = new Document("Test");
docEvent.fire(d); //general fire of a Document related event
-
+
//send a created event
docEvent.select(
new AnnotationLiteral<Created>(){}).fire(d);
-
-
+
+
d.update();
//send an updated by admin event
updatedByAdminEvent.fire(d);
-
+
//send an updated by FooUser event
docEvent.select(new UserBinding("FooUser")).fire(d);
-
+
}
-
+
}
@@ -57,5 +57,5 @@
public String updatedBy() {
return this.userName;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/build.properties b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/build.properties
index 362e832..3535d60 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/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}-multiple-event-qualifiers"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/build.xml b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/events/multiple-event-qualifiers/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/client/test/client/WebTest.java
index 748fc4d..2b3a8ad 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/client/test/client/WebTest.java
@@ -27,7 +27,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String TEST_NAME =
+ private static final String TEST_NAME =
"events-multiple-event-qualifiers";
private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -99,10 +99,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/events/multiple-event-qualifiers/servlet/test/beans/Document.java b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Document.java
index 6e6eee6..045814b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Document.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Document.java
@@ -24,11 +24,11 @@
this.name = name;
this.isBlog = blog;
}
-
+
public boolean isBlog(){
return this.isBlog;
}
-
+
public void update(){
System.out.println("Document:" + name + " updated.");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventObserver.java b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventObserver.java
index ace53f0..63fb58d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventObserver.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventObserver.java
@@ -36,17 +36,17 @@
System.out.println("TestEventObserver:afterDocumentUpdate");
documentAfterDocumentUpdate++;
}
-
+
public void onAnyBlogEvent(
@Observes @Blog Document d) {
System.out.println("TestEventObserver:onAnyBlogEvent");
documentOnAnyBlogEvent++;
}
-
+
public void onAnyDocumentEvent(@Observes Document d){
System.out.println("TestEventObserver:onAnyDocumentEvent");
documentOnAnyDocumentEvent++;
-
+
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/servlet/MultipleEventQualifierTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/servlet/MultipleEventQualifierTestServlet.java
index 315c7fd..e9f5998 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/servlet/MultipleEventQualifierTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/servlet/MultipleEventQualifierTestServlet.java
@@ -50,15 +50,15 @@
if (TestEventObserver.documentAfterDocumentUpdate != 1) {
msg += "Document updated event not received by observer";
}
-
+
if (TestEventObserver.documentOnAnyBlogEvent != 1) {
msg += "On Any Blog event not received by observer";
}
-
+
if (TestEventObserver.documentOnAnyDocumentEvent != 3) {
msg += "On any document event not received by observer";
}
-
+
writer.write(msg + "\n");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/build.properties b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/build.properties
index 5b4b830..f9be196 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/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-event-observer"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/build.xml b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/events/simple-event-observers/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/client/test/client/WebTest.java
index bcac1d2..02c7379 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/client/test/client/WebTest.java
@@ -27,7 +27,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String TEST_NAME =
+ private static final String TEST_NAME =
"events-simple-event-observer";
private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -99,10 +99,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/events/simple-event-observers/servlet/test/beans/Document.java b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/Document.java
index d857f5a..0cbf7e7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/Document.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/Document.java
@@ -22,7 +22,7 @@
System.out.println("Document created with name" + name );
this.name = name;
}
-
+
public void update(){
System.out.println("Document:" + name + " updated.");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestRequestScopedBean.java
index da85887..50f1b91 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestRequestScopedBean.java
@@ -22,7 +22,7 @@
public class TestRequestScopedBean {
@Inject @Created Event<Document> docCreatedEvent;
@Inject @Updated Event<Document> docUpdatedEvent;
-
+
public void fireEvents(){
Document d = new Document("Test");
docCreatedEvent.fire(d);
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/servlet/SimpleEventObserverTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/servlet/SimpleEventObserverTestServlet.java
index 9d1a56a..4bb5d18 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/servlet/SimpleEventObserverTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/servlet/SimpleEventObserverTestServlet.java
@@ -50,7 +50,7 @@
if (TestEventObserver.documentUpdatedEvent != 1){
msg += "Document updated event not received by observer";
}
-
+
if (TestEventObserver.documentAnyEvents != 2){
msg += "# of Document event received by observer does not match expected values. expected = 2. observed="+ TestEventObserver.documentAnyEvents;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/build.xml b/appserver/tests/appserv-tests/devtests/cdi/implicit/build.xml
index 10bd76e..4e0b956 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/build.xml
@@ -30,86 +30,86 @@
&commonBuild;
&commonRun;
&reporting;
-
+
<property name="implicit-target" value="all" />
- <taskdef resource="net/sf/antcontrib/antcontrib.properties">
- <classpath>
- <pathelement location="${env.APS_HOME}/devtests/cdi/lib/ant-contrib-1.0b3.jar" />
- </classpath>
- </taskdef>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+ <classpath>
+ <pathelement location="${env.APS_HOME}/devtests/cdi/lib/ant-contrib-1.0b3.jar" />
+ </classpath>
+ </taskdef>
- <target name="run-test">
- <antcall target="implicit">
- <param name="implicit-target" value="run-test" />
- </antcall>
- </target>
+ <target name="run-test">
+ <antcall target="implicit">
+ <param name="implicit-target" value="run-test" />
+ </antcall>
+ </target>
- <target name="all">
- <antcall target="implicit">
- <param name="implicit-target" value="all" />
- </antcall>
- </target>
+ <target name="all">
+ <antcall target="implicit">
+ <param name="implicit-target" value="all" />
+ </antcall>
+ </target>
- <target name="clean">
- <antcall target="implicit">
- <param name="implicit-target" value="clean" />
- </antcall>
- </target>
+ <target name="clean">
+ <antcall target="implicit">
+ <param name="implicit-target" value="clean" />
+ </antcall>
+ </target>
- <target name="build">
- <antcall target="implicit">
- <param name="implicit-target" value="build" />
- </antcall>
- </target>
+ <target name="build">
+ <antcall target="implicit">
+ <param name="implicit-target" value="build" />
+ </antcall>
+ </target>
- <target name="setup">
- <antcall target="implicit">
- <param name="implicit-target" value="setup" />
- </antcall>
- </target>
+ <target name="setup">
+ <antcall target="implicit">
+ <param name="implicit-target" value="setup" />
+ </antcall>
+ </target>
- <target name="deploy">
- <antcall target="implicit">
- <param name="implicit-target" value="deploy" />
- </antcall>
- </target>
+ <target name="deploy">
+ <antcall target="implicit">
+ <param name="implicit-target" value="deploy" />
+ </antcall>
+ </target>
- <target name="undeploy">
- <antcall target="implicit">
- <param name="implicit-target" value="undeploy" />
- </antcall>
- </target>
+ <target name="undeploy">
+ <antcall target="implicit">
+ <param name="implicit-target" value="undeploy" />
+ </antcall>
+ </target>
- <target name="unsetup">
- <antcall target="implicit">
- <param name="implicit-target" value="unsetup" />
- </antcall>
- </target>
+ <target name="unsetup">
+ <antcall target="implicit">
+ <param name="implicit-target" value="unsetup" />
+ </antcall>
+ </target>
- <target name="run">
- <antcall target="implicit">
- <param name="implicit-target" value="run" />
- </antcall>
- </target>
+ <target name="run">
+ <antcall target="implicit">
+ <param name="implicit-target" value="run" />
+ </antcall>
+ </target>
- <target name="implicit">
- <record name="implicit.output" action="start" />
- <ant dir="simple-ejb-cdi" target="${implicit-target}" />
- <ant dir="deployment-option" target="${implicit-target}" />
- <record name="implicit.output" action="stop" />
- </target>
+ <target name="implicit">
+ <record name="implicit.output" action="start" />
+ <ant dir="simple-ejb-cdi" target="${implicit-target}" />
+ <ant dir="deployment-option" target="${implicit-target}" />
+ <record name="implicit.output" action="stop" />
+ </target>
- <target name="usage">
- <echo> Usage:
- ant all (Executes all the smoke tests)
- ant clean (cleans all the smoke tests)
- ant build (builds all the smoke tests)
- ant setup (sets up all resources for smoke tests)
- ant deploy (deploys all the smoke apps)
- ant run (Executes all the smoke tests)
- ant undeploy (undeploys all the smoke apps)
- ant unsetup (unsets all resources for smoke tests)
- </echo>
- </target>
+ <target name="usage">
+ <echo> Usage:
+ ant all (Executes all the smoke tests)
+ ant clean (cleans all the smoke tests)
+ ant build (builds all the smoke tests)
+ ant setup (sets up all resources for smoke tests)
+ ant deploy (deploys all the smoke apps)
+ ant run (Executes all the smoke tests)
+ ant undeploy (undeploys all the smoke apps)
+ ant unsetup (unsets all resources for smoke tests)
+ </echo>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/build.properties b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/build.properties
index 281ba02..8b3bab1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/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="simple-ejb-implicit-cdi-deployment-opt"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java
index aaba745..c1f77ca 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java
@@ -62,7 +62,7 @@
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
private void testResponse(String testDescription, String response){
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/build.properties b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/build.properties
index 382bcd3..1ecb9ab 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-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="simple-ejb-implicit-cdi"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/build.xml b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/build.xml
index 3f84529..05af837 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/build.xml
@@ -31,43 +31,43 @@
<target name="all" depends="build,deploy,run,undeploy"/>
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete file="client/Client.java"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common"/>
+ <delete file="client/Client.java"/>
+ </target>
- <target name="compile" depends="clean">
- <copy file="client/Client.java.token" tofile="client/Client.java"/>
- <replace file="client/Client.java" token="@ORB_PORT@" value="${orb.port}"/>
+ <target name="compile" depends="clean">
+ <copy file="client/Client.java.token" tofile="client/Client.java"/>
+ <replace file="client/Client.java" token="@ORB_PORT@" value="${orb.port}"/>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- </target>
+ <antcall target="compile-common">
+ <param name="src" value="ejb"/>
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="client"/>
+ </antcall>
+ </target>
- <target name="build" depends="compile">
- <antcall target="build-ear-common">
- <param name="ejbjar.classes" value="**/Sless*.class, **/Foo*.class, **/ImplicitTestBean.class"/>
- <param name="appclientjar.classes" value="**/Client.class, **/Foo*.class, **/Sless.class"/>
- </antcall>
- </target>
+ <target name="build" depends="compile">
+ <antcall target="build-ear-common">
+ <param name="ejbjar.classes" value="**/Sless*.class, **/Foo*.class, **/ImplicitTestBean.class"/>
+ <param name="appclientjar.classes" value="**/Client.class, **/Foo*.class, **/Sless.class"/>
+ </antcall>
+ </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">
- <antcall target="runclient-common"/>
- </target>
+ <target name="run" depends="init-common">
+ <antcall target="runclient-common"/>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
+ <target 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/implicit/simple-ejb-cdi/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java
index c266aa3..38b52e1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java
@@ -41,10 +41,10 @@
// NOTE: Token 3700 will be replaced in @EJB annotations below
// with the value of the port from config.properties during the build
//
- @EJB(mappedName = "corbaname:iiop:localhost:3700#test.Foo")
+ @EJB(mappedName = "corbaname:iiop:localhost:3700#test.Foo")
private static Foo sless2;
- @EJB(mappedName = "corbaname:iiop:localhost:3700#java:global/simple-ejb-implicit-cdiApp/simple-ejb-implicit-cdi-ejb/SlessEJB!test.Foo")
+ @EJB(mappedName = "corbaname:iiop:localhost:3700#java:global/simple-ejb-implicit-cdiApp/simple-ejb-implicit-cdi-ejb/SlessEJB!test.Foo")
private static Foo sless3;
public void doTest() {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/test/SlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/test/SlessEJB.java
index a00c717..63a9b35 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/test/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/test/SlessEJB.java
@@ -33,7 +33,7 @@
if (testBean != null) {
return "hello";
}
-
+
return null;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/injection-point/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/injection-point/WebTest.java
index 4fd782a..ba4eb6c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/injection-point/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/injection-point/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Testing InjectionPoint capabilities");
WebTest webTest = new WebTest(args);
@@ -51,7 +51,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -61,7 +61,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl?username=scott&password=tiger";
System.out.println("opening connection to " + url);
@@ -101,10 +101,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/injection-point/build.properties b/appserver/tests/appserv-tests/devtests/cdi/injection-point/build.properties
index 57ba5ff..baea5a9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/injection-point/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/injection-point/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-programmatic-lookup"/>
<property name="appname" value="${module}-servlet-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/injection-point/build.xml b/appserver/tests/appserv-tests/devtests/cdi/injection-point/build.xml
index c0d904d..872f366 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/injection-point/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/injection-point/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/injection-point/servlet/InjectionPointFilter.java b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/InjectionPointFilter.java
index c884226..b587f6f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/InjectionPointFilter.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/InjectionPointFilter.java
@@ -30,19 +30,19 @@
//A web filter to set ServletRequest in the thread local context.
@WebFilter(urlPatterns="/*")
public class InjectionPointFilter implements Filter{
-
+
@Override
public void destroy() {
System.out.println("InjectionPointFilter::destroy");
-
+
}
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain arg2) throws IOException, ServletException {
System.out.println("InjectionPointFilter::doFilter");
- //setting the ServletRequest in the thread-local
+ //setting the ServletRequest in the thread-local
//variable so that it could be used in HttpParams
- HttpParams.sr.set(req);
+ HttpParams.sr.set(req);
arg2.doFilter(req, res);
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParams.java b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParams.java
index 5e2793f..6d71e10 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParams.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParams.java
@@ -26,13 +26,13 @@
@RequestScoped
public class HttpParams {
//A thread local variable to house the servlet request. This is set by the
- //servlet filter. This is not a recommended way to get hold of HttpServletRequest
+ //servlet filter. This is not a recommended way to get hold of HttpServletRequest
//in a CDI bean but a workaround that is described in
//http://www.seamframework.org/Community/HowToReachHttpServletRequestAndHttpServletResponseFromBean
//The right approach is to use JSF's FacesContext as described in
//https://docs.jboss.org/weld/reference/snapshot/en-US/html/injection.html#d0e1635
public static ThreadLocal<ServletRequest> sr = new ThreadLocal<ServletRequest>();
-
+
@Produces
@HttpParam("")
String getParamValue(InjectionPoint ip) {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/build.xml b/appserver/tests/appserv-tests/devtests/cdi/interceptors/build.xml
index 0cb7ab1..ddf877a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/build.xml
@@ -91,15 +91,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the interceptors tests)
- ant clean (cleans all the interceptors tests)
- ant build (builds all the interceptors tests)
- ant setup (sets up all resources for interceptors tests)
- ant deploy (deploys all the interceptors apps)
- ant run (Executes all the interceptors tests)
- ant undeploy (undeploys all the interceptors apps)
- ant unsetup (unsets all resources for interceptors tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the interceptors tests)
+ ant clean (cleans all the interceptors tests)
+ ant build (builds all the interceptors tests)
+ ant setup (sets up all resources for interceptors tests)
+ ant deploy (deploys all the interceptors apps)
+ ant run (Executes all the interceptors tests)
+ ant undeploy (undeploys all the interceptors apps)
+ ant unsetup (unsets all resources for interceptors tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/build.properties b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/build.properties
index 90a4e51..156cd90 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/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}-bean-validation"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/build.xml b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/build.xml
index 4c7e300..82ff07f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/build.xml
@@ -43,7 +43,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -51,23 +51,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java fork="true" classname="test.client.WebTest">
<jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${suspend},address=${jpda.port}"/>
@@ -80,10 +80,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/interceptors/interceptors-bean-validation/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/client/test/client/WebTest.java
index 0684cfd..1060ef0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/client/test/client/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -48,7 +48,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -58,7 +58,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot + "/myurl";
System.out.println("opening connection to " + url);
HttpURLConnection conn = (HttpURLConnection) (new URL(url)).openConnection();
@@ -94,10 +94,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/interceptors/interceptors-bean-validation/servlet/test/beans/CDITest.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/CDITest.java
index ea52f6c..ba89ce3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/CDITest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/CDITest.java
@@ -31,5 +31,5 @@
@InterceptorBinding
public @interface CDITest {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/build.properties b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/build.properties
index 8432d77..44c4e54 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/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}-interceptor-binding-type-inheritance"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/build.xml b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/interceptors/interceptors-binding-type-inheritance/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/client/test/client/WebTest.java
index 3c45f3c..326abbc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/client/test/client/WebTest.java
@@ -27,7 +27,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String TEST_NAME =
+ private static final String TEST_NAME =
"interceptors-interceptor-binding-type-inheritance";
private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -99,10 +99,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/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/SecureInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/SecureInterceptor.java
index 18c1b49..7c4c243 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/SecureInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/SecureInterceptor.java
@@ -26,13 +26,13 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestRequestScopedBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
-
+
System.out.println("SecureInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
"into TransactionInterceptor failed";
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/ShoppingCart.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/ShoppingCart.java
index 793c408..1d6f337 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/ShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/ShoppingCart.java
@@ -17,7 +17,7 @@
package test.beans;
public class ShoppingCart {
-
+
@Action public void checkout(){
System.out.println("ShoppingCart::checkout");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionInterceptor.java
index 127ba1b..6716e13 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionInterceptor.java
@@ -26,13 +26,13 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestRequestScopedBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
-
+
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
"into TransactionInterceptor failed";
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Transactional.java
index dcb5931..04fd352 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Transactional.java
@@ -30,5 +30,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionalSecureInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionalSecureInterceptor.java
index 407b079..0059316 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionalSecureInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionalSecureInterceptor.java
@@ -26,13 +26,13 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestRequestScopedBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
-
+
System.out.println("TransactionalSecureInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
"into TransactionInterceptor failed";
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/build.properties b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/build.properties
index 669edc0..2c9527a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/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}-binding-types-with-members"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/build.xml b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/interceptors/interceptors-binding-type-with-members/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/client/test/client/WebTest.java
index ed0bec0..60d79f9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/client/test/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -59,7 +59,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -98,10 +98,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/interceptors/interceptors-binding-type-with-members/servlet/test/beans/RequiresNewTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/RequiresNewTransactionInterceptor.java
index e626a37..c030604 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/RequiresNewTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/RequiresNewTransactionInterceptor.java
@@ -28,10 +28,10 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("RequiresNewTransactionInterceptor::AroundInvoke");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/ShoppingCart.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/ShoppingCart.java
index 60a8a40..f8c9a8a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/ShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/ShoppingCart.java
@@ -20,10 +20,10 @@
@Transactional(requiresNew=true)
@Preferred
public class ShoppingCart {
-
+
public void addItem(String s) {
System.out.println("ShoppingCart::addItem called");
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/TransactionInterceptor.java
index afdc156..e1d0d52 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/TransactionInterceptor.java
@@ -27,15 +27,15 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java
index 088d6ce..3b898d4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java
@@ -37,7 +37,7 @@
@Inject
@Preferred
TestBean tb;
-
+
@Inject
@Preferred
ShoppingCart sc;
@@ -63,30 +63,30 @@
+ TransactionInterceptor.aroundInvokeInvocationCount;
if (!TransactionInterceptor.errorMessage.trim().equals(""))
msg += TransactionInterceptor.errorMessage;
-
+
if (RequiresNewTransactionInterceptor.aroundInvokeCalled)
msg += "RequiresNew TransactionInterceptor called when " +
- "it shouldn't have been called";
-
+ "it shouldn't have been called";
+
TransactionInterceptor.clear();
//invoke shopping cart bean. This should result in an invocation on
//the RequiresNewTransactional
sc.addItem("Test Item");
if (!RequiresNewTransactionInterceptor.aroundInvokeCalled)
msg += "Business method interceptor aroundInvoke in requires new " +
- "transaction interceptor not called";
+ "transaction interceptor not called";
if (RequiresNewTransactionInterceptor.aroundInvokeInvocationCount != 1)
msg += "Business method requires new interceptor invocation on " +
- "method-level interceptor annotation count not expected. "
+ "method-level interceptor annotation count not expected. "
+ "expected =1, actual="
+ RequiresNewTransactionInterceptor.aroundInvokeInvocationCount;
if (!RequiresNewTransactionInterceptor.errorMessage.trim().equals(""))
msg += RequiresNewTransactionInterceptor.errorMessage;
-
+
//TransactionInterceptor should not have been called
if (TransactionInterceptor.aroundInvokeCalled)
msg += "TranscationInterceptor aroundInvoke called when a requiresnew" +
- "transaction interceptor should have been called";
+ "transaction interceptor should have been called";
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/build.properties b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/build.properties
index 7fee82e..8e5d153 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/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}-business-method-interceptors"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/build.xml b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/interceptors/interceptors-business-method-interception/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/client/test/client/WebTest.java
index ed0bec0..60d79f9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/client/test/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -59,7 +59,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -98,10 +98,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/interceptors/interceptors-business-method-interception/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/TransactionInterceptor.java
index afdc156..e1d0d52 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/TransactionInterceptor.java
@@ -27,15 +27,15 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/Transactional.java
index 98f85d4..8bd98cb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/Transactional.java
@@ -31,5 +31,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/build.properties b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/build.properties
index baeb63b..9611f0c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/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}-invalid-interceptor-in-beans-xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/build.xml b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/TransactionInterceptor.java
index afdc156..e1d0d52 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/TransactionInterceptor.java
@@ -27,15 +27,15 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/Transactional.java
index dcb5931..04fd352 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/Transactional.java
@@ -30,5 +30,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/build.properties b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/build.properties
index a5b08a4..13e5ad6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/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}-multiple-interceptor-binding-annotations"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/build.xml b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/interceptors/interceptors-multiple-interceptor-binding-annotations/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/client/test/client/WebTest.java
index 77abe96..7c717fd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/client/test/client/WebTest.java
@@ -27,7 +27,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String TEST_NAME =
+ private static final String TEST_NAME =
"interceptors-multiple-interceptor-binding-annotations";
private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -99,10 +99,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/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/ShoppingCart.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/ShoppingCart.java
index b99ce6c..20b796e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/ShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/ShoppingCart.java
@@ -17,7 +17,7 @@
package test.beans;
public class ShoppingCart {
-
+
@Transactional @Secure public void checkout(){
System.out.println("ShoppingCart::checkout");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Transactional.java
index dcb5931..04fd352 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Transactional.java
@@ -30,5 +30,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TransactionalSecureInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TransactionalSecureInterceptor.java
index d52eb58..4ff7fce 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TransactionalSecureInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TransactionalSecureInterceptor.java
@@ -26,13 +26,13 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestRequestScopedBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
-
+
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
"into TransactionInterceptor failed";
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/servlet/MultipleInterceptorBindingAnnotationsTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/servlet/MultipleInterceptorBindingAnnotationsTestServlet.java
index f8c0a8d..e560e87 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/servlet/MultipleInterceptorBindingAnnotationsTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/servlet/MultipleInterceptorBindingAnnotationsTestServlet.java
@@ -39,10 +39,10 @@
@Inject
@Preferred
TestBean tb;
-
+
@Inject
ShoppingCart sc;
-
+
@Inject
@Preferred
SecondShoppingCart sc2;
@@ -50,7 +50,7 @@
@Inject
@Preferred
ThirdShoppingCart sc3;
-
+
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
@@ -64,7 +64,7 @@
tb.m1();
if (TransactionalSecureInterceptor.aroundInvokeCalled)
msg += "Business method interceptor aroundInvoke on " +
- "TransactionSecureInterceptor called when it shouldn't have";
+ "TransactionSecureInterceptor called when it shouldn't have";
tb.m2();
if (TransactionalSecureInterceptor.aroundInvokeInvocationCount != 0)
msg += "Business method interceptor invocation on method-level "
@@ -73,8 +73,8 @@
+ TransactionalSecureInterceptor.aroundInvokeInvocationCount;
if (!TransactionalSecureInterceptor.errorMessage.trim().equals(""))
msg += TransactionalSecureInterceptor.errorMessage;
-
-
+
+
//Now use the two shopping cart to test TransactionalSecureInterceptor
sc.checkout();
if (!TransactionalSecureInterceptor.aroundInvokeCalled)
@@ -87,7 +87,7 @@
+ TransactionalSecureInterceptor.aroundInvokeInvocationCount;
if (!TransactionalSecureInterceptor.errorMessage.trim().equals(""))
msg += TransactionalSecureInterceptor.errorMessage;
-
+
sc2.checkout();
if (TransactionalSecureInterceptor.aroundInvokeInvocationCount != 2)
msg += "Business method interceptor invocation on method-level "
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/build.properties b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/build.properties
index 647c53f..fc345de 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/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}-multiple-interceptor-implementations"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/build.xml b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/interceptors/interceptors-multiple-interceptors-for-a-binding-type/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/client/test/client/WebTest.java
index 98bf8c6..e4dca24 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/client/test/client/WebTest.java
@@ -27,7 +27,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String TEST_NAME =
+ private static final String TEST_NAME =
"interceptors-multiple-interceptors-for-a-binding-type";
private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -99,10 +99,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/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TransactionInterceptor.java
index 0ae310f..33cedf9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TransactionInterceptor.java
@@ -27,16 +27,16 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestRequestScopedBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
-
+
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
tb.interceptorInvocationOrder.add(this.getClass().getCanonicalName());
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/Transactional.java
index dcb5931..04fd352 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/Transactional.java
@@ -30,5 +30,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/servlet/MultipleInterceptorImplementationsTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/servlet/MultipleInterceptorImplementationsTestServlet.java
index d5cf6f3..7b7465f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/servlet/MultipleInterceptorImplementationsTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/servlet/MultipleInterceptorImplementationsTestServlet.java
@@ -39,7 +39,7 @@
@Preferred
TestBean tb;
- @Inject
+ @Inject
TestRequestScopedBean trsb;
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
@@ -63,30 +63,30 @@
if (!TransactionInterceptor.errorMessage.trim().equals(""))
msg += TransactionInterceptor.errorMessage;
-
+
if (!SecondTransactionInterceptor.aroundInvokeCalled)
msg += "Business method interceptor aroundInvoke in the second " +
- "transaction interceptor not called";
+ "transaction interceptor not called";
tb.m2(); //calling m2 again
if (SecondTransactionInterceptor.aroundInvokeInvocationCount != 3)
msg += "Business method second interceptor invocation on method-level "
+ "interceptor annotation count not expected. "
+ "expected =3, actual="
+ SecondTransactionInterceptor.aroundInvokeInvocationCount;
-
+
//test ordering of interceptors in the system
- boolean expectedOrdering =
+ boolean expectedOrdering =
((trsb.interceptorInvocationOrder.get(0).
equals(SecondTransactionInterceptor.class.getCanonicalName()))
&& (trsb.interceptorInvocationOrder.get(1).
equals(TransactionInterceptor.class.getCanonicalName())));
- if (!expectedOrdering)
+ if (!expectedOrdering)
msg += "Interceptor invocation order does not match with the expected order";
-
- //test disabling of interceptors via beans.xml
- if (ThirdTransactionInterceptor.aroundInvokeCalled)
+
+ //test disabling of interceptors via beans.xml
+ if (ThirdTransactionInterceptor.aroundInvokeCalled)
msg += "Disabled interceptor called";
-
+
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/build.properties b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/build.properties
index a646191..b1011de 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/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}-use-of-at-interceptors"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/build.xml b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/interceptors/interceptors-use-of-at-interceptors/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/client/test/client/WebTest.java
index cd812bd..07bde93 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/client/test/client/WebTest.java
@@ -32,7 +32,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String TEST_NAME =
+ private static final String TEST_NAME =
"interceptors-use-of-";
private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -55,7 +55,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -65,7 +65,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -104,10 +104,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/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/SecureInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/SecureInterceptor.java
index 18c1b49..7c4c243 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/SecureInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/SecureInterceptor.java
@@ -26,13 +26,13 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestRequestScopedBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
-
+
System.out.println("SecureInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
"into TransactionInterceptor failed";
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TransactionInterceptor.java
index 127ba1b..6716e13 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TransactionInterceptor.java
@@ -26,13 +26,13 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestRequestScopedBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
-
+
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
"into TransactionInterceptor failed";
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Transactional.java
index dcb5931..04fd352 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Transactional.java
@@ -30,5 +30,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java
index 146ff27..32bb459 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java
@@ -36,14 +36,14 @@
@Inject
@Preferred
TestBean tb;
-
+
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
PrintWriter writer = res.getWriter();
writer.write("Hello from Servlet 3.0.");
String msg = "";
-
+
tb.m1();
if (!TransactionInterceptor.aroundInvokeCalled)
msg +="TransactionInterceptor aroundInvoke method not called";
@@ -51,12 +51,12 @@
msg +="SecureInterceptor aroundInvoke method not called";
if ((TransactionInterceptor.aroundInvokeInvocationCount != 1))
msg +="TransactionInterceptor aroundInvoke invocation count is " +
- "not expected 1 but" +
+ "not expected 1 but" +
TransactionInterceptor.aroundInvokeInvocationCount;
tb.m2();
if ((SecureInterceptor.aroundInvokeInvocationCount != 2))
msg +="SecureInterceptor aroundInvoke invocation count is " +
- "not expected 2 but" +
+ "not expected 2 but" +
SecureInterceptor.aroundInvokeInvocationCount;
writer.write(msg + "\n");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/build.properties b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/build.properties
index 1ab3b40..dc45382 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/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}-use-of-interceptors-in-ejbs-through-at-interceptors"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/build.xml b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/client/test/client/WebTest.java
index e7521b7..1673182 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/client/test/client/WebTest.java
@@ -32,7 +32,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String TEST_NAME =
+ private static final String TEST_NAME =
"interceptors-use-of-interceptors-in-ejbs-through-at-interceptors";
private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -55,7 +55,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -65,7 +65,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -104,10 +104,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/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/api/Secure.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/api/Secure.java
index dbf53e2..5c24d1b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/api/Secure.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/api/Secure.java
@@ -30,11 +30,11 @@
* EJBs annotated with Secure are intercepted by SecurityInterceptor, ensuring
* that the caller has the permissions to call an EJB method. May only be
* applied to EJBs.
- *
+ *
* @author ifischer
- *
+ *
* @see SecurityInterceptor
- *
+ *
* @since 0.3
*/
@Inherited
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
index 57f58c4..49834a0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
@@ -32,26 +32,26 @@
/**
* Realizes security for EJBs.
- *
+ *
* @author ifischer
- *
+ *
*/
@Secure
@Interceptor
public class SecurityInterceptor implements Serializable
{
private static final Logger LOG = Logger.getLogger(SecurityInterceptor.class.getName());
-
+
public static boolean aroundInvokeCalled = false;
-
+
@Resource
private EJBContext ejbCtx;
-
+
/**
* Perform lookup for permissions.
* Does the caller has the permission to call the method?
* TODO: implement lookup
- *
+ *
* @param InvocationContext of intercepted method
* @return
* @throws Exception
@@ -61,18 +61,18 @@
{
Principal p = ejbCtx.getCallerPrincipal();
Method interfaceMethod = ctx.getMethod();
-
+
LOG.log(Level.INFO, "EJB Method called [Full]:\"{0}\" by Principal:{1}", new Object[]{getFullEJBClassName(interfaceMethod), p.toString()});
LOG.log(Level.INFO, "EJB Method called [Methodonly]:{0} by Principal:{1}", new Object[]{interfaceMethod.getName(), p.toString()});
-
+
SecurityInterceptor.aroundInvokeCalled = true;
return ctx.proceed();
}
-
+
/**
- * The EJBContext interface doesn't provide convenient methods to get the name of the EJB class,
+ * The EJBContext interface doesn't provide convenient methods to get the name of the EJB class,
* so the classname has to be extracted from the method.
- *
+ *
* @param the method whose classname is needed
* @return classname (fully qualified) of given method, e.g. "com.profitbricks.user.api.UserService"
*/
@@ -80,15 +80,15 @@
// extract className from methodName
// methodName format example:"public void com.profitbricks.user.api.UserService.testMe()"
String methodName = method.toString();
-
+
int start = methodName.lastIndexOf(' ') + 1;
int end = methodName.lastIndexOf('.');
-
+
String className = methodName.substring(start, end);
-
+
return className;
}
-
+
public static void reset(){
//reset invocation status
SecurityInterceptor.aroundInvokeCalled = false;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java
index 86eec7b..f40291c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java
@@ -28,24 +28,24 @@
* <p>
* Manage user-related data
* </p>
- *
+ *
* <p>
* A service that implements this interface is responsible for managing
* user-related master-data
* </p>
- *
+ *
* @author kane
- *
+ *
* @see User
*/
public interface UserService
{
-
+
/**
* <p>
* Get a {@link User} by the user id
* </p>
- *
+ *
* @param userid
* The userid to search for
* @return A {@link User} object or <code>null</code> if no user was found
@@ -56,16 +56,16 @@
* <p>
* Add a new user
* </p>
- *
+ *
* <p>
* The implementation must ensure that the provided user object is persisted
* before returning the assigned persistent user ID.
* </p>
- *
+ *
* @param user
* The user object to persist
* @return The newly created persistent ID of the user object
- *
+ *
* @see User
*/
public Long addUser(User user) throws EJBException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/model/User.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/model/User.java
index 59450f1..48009de 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/model/User.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/model/User.java
@@ -23,9 +23,9 @@
/**
* A user login account within our system.
- *
+ *
* @author kane
- *
+ *
* @since 0.1
*/
public interface User
@@ -35,7 +35,7 @@
/**
* Get the value of firstName
- *
+ *
* @return the value of firstName
*/
public String getFirstName();
@@ -44,19 +44,19 @@
* <p>
* Get the gender for the user
* </p>
- *
+ *
* <p>
* A gender is much better suited to our needs here as the pure biological
* sex is.
* </p>
- *
+ *
* @return the value of gender
*/
public Gender getGender();
/**
* Get the value of lastName
- *
+ *
* @return the value of lastName
*/
public String getLastName();
@@ -65,7 +65,7 @@
* <p>
* Get the username used for login
* </p>
- *
+ *
* @return the value of username
*/
public String getUsername();
@@ -74,7 +74,7 @@
* <p>
* Get the email address of the user
* </p>
- *
+ *
* @return the value of the email
*/
public String getEmailAddress();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
index e86995f..fca3c36 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
@@ -32,7 +32,7 @@
* <p>
* Implementation of the UserService.
* </p>
- *
+ *
* @author chaoslayer
*/
@Stateless
@@ -45,16 +45,16 @@
* <p>
* Add a new user
* </p>
- *
+ *
* <p>
* The implementation must ensure that the provided user object is persisted
* before returning the assigned persistent user ID.
* </p>
- *
+ *
* @param user
* The user object to persist
* @return The newly created persistent ID of the user object
- *
+ *
* @see UserImpl
*/
@Override
@@ -69,7 +69,7 @@
* <p>
* Get a {@link User} by the user id
* </p>
- *
+ *
* @param userid
* The userid to search for
* @return A {@link User} object or <code>null</code> if no user was found
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/model/UserImpl.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/model/UserImpl.java
index 07ae9b7..1e734e3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/model/UserImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/model/UserImpl.java
@@ -28,7 +28,7 @@
* <p>
* Client-side implementation of {@link User}.
* </p>
- *
+ *
* @author chaoslayer
*/
public class UserImpl implements User
@@ -55,7 +55,7 @@
* <p>
* Get the username used for login
* </p>
- *
+ *
* @return the value of username
*/
public String getUsername()
@@ -67,7 +67,7 @@
* <p>
* Set the username
* </p>
- *
+ *
* @param username
* new value of username
*/
@@ -80,12 +80,12 @@
* <p>
* Get the gender for the user
* </p>
- *
+ *
* <p>
* A gender is much better suited to our needs here as the pure biological
* sex is.
* </p>
- *
+ *
* @return the value of gender
*/
public Gender getGender()
@@ -97,12 +97,12 @@
* <p>
* Set the gender for the user
* </p>
- *
+ *
* <p>
* A gender is much better suited to our needs here as the pure biological
* sex is.
* </p>
- *
+ *
* @param gender
* new value of gender
*/
@@ -113,7 +113,7 @@
/**
* Get the value of firstName
- *
+ *
* @return the value of firstName
*/
public String getFirstName()
@@ -123,7 +123,7 @@
/**
* Set the value of firstName
- *
+ *
* @param firstName
* new value of firstName
*/
@@ -134,7 +134,7 @@
/**
* Get the value of lastName
- *
+ *
* @return the value of lastName
*/
public String getLastName()
@@ -144,7 +144,7 @@
/**
* Set the value of lastName
- *
+ *
* @param lastName
* new value of lastName
*/
@@ -155,7 +155,7 @@
/**
* Get the value of emailAddress
- *
+ *
* @return the value of emailAddress
*/
public String getEmailAddress()
@@ -165,7 +165,7 @@
/**
* Set the value of emailAddress
- *
+ *
* @param emailAddress
* new value of emailAddress
*/
@@ -176,7 +176,7 @@
/**
* String representation of the object data
- *
+ *
* @return The object data as String
*/
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/build.properties b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/build.properties
index 82f0c3b..7b8b0d1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/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}-use-of-interceptors-in-ejbs-through-interceptor-bindings"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/build.xml b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/client/test/client/WebTest.java
index 6fba929..956ae27 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/client/test/client/WebTest.java
@@ -32,7 +32,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String TEST_NAME =
+ private static final String TEST_NAME =
"interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings";
private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for interceptors");
WebTest webTest = new WebTest(args);
@@ -55,7 +55,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -65,7 +65,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -104,10 +104,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/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/api/Secure.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/api/Secure.java
index dbf53e2..5c24d1b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/api/Secure.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/api/Secure.java
@@ -30,11 +30,11 @@
* EJBs annotated with Secure are intercepted by SecurityInterceptor, ensuring
* that the caller has the permissions to call an EJB method. May only be
* applied to EJBs.
- *
+ *
* @author ifischer
- *
+ *
* @see SecurityInterceptor
- *
+ *
* @since 0.3
*/
@Inherited
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
index 57f58c4..49834a0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
@@ -32,26 +32,26 @@
/**
* Realizes security for EJBs.
- *
+ *
* @author ifischer
- *
+ *
*/
@Secure
@Interceptor
public class SecurityInterceptor implements Serializable
{
private static final Logger LOG = Logger.getLogger(SecurityInterceptor.class.getName());
-
+
public static boolean aroundInvokeCalled = false;
-
+
@Resource
private EJBContext ejbCtx;
-
+
/**
* Perform lookup for permissions.
* Does the caller has the permission to call the method?
* TODO: implement lookup
- *
+ *
* @param InvocationContext of intercepted method
* @return
* @throws Exception
@@ -61,18 +61,18 @@
{
Principal p = ejbCtx.getCallerPrincipal();
Method interfaceMethod = ctx.getMethod();
-
+
LOG.log(Level.INFO, "EJB Method called [Full]:\"{0}\" by Principal:{1}", new Object[]{getFullEJBClassName(interfaceMethod), p.toString()});
LOG.log(Level.INFO, "EJB Method called [Methodonly]:{0} by Principal:{1}", new Object[]{interfaceMethod.getName(), p.toString()});
-
+
SecurityInterceptor.aroundInvokeCalled = true;
return ctx.proceed();
}
-
+
/**
- * The EJBContext interface doesn't provide convenient methods to get the name of the EJB class,
+ * The EJBContext interface doesn't provide convenient methods to get the name of the EJB class,
* so the classname has to be extracted from the method.
- *
+ *
* @param the method whose classname is needed
* @return classname (fully qualified) of given method, e.g. "com.profitbricks.user.api.UserService"
*/
@@ -80,15 +80,15 @@
// extract className from methodName
// methodName format example:"public void com.profitbricks.user.api.UserService.testMe()"
String methodName = method.toString();
-
+
int start = methodName.lastIndexOf(' ') + 1;
int end = methodName.lastIndexOf('.');
-
+
String className = methodName.substring(start, end);
-
+
return className;
}
-
+
public static void reset(){
//reset invocation status
SecurityInterceptor.aroundInvokeCalled = false;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java
index 86eec7b..f40291c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java
@@ -28,24 +28,24 @@
* <p>
* Manage user-related data
* </p>
- *
+ *
* <p>
* A service that implements this interface is responsible for managing
* user-related master-data
* </p>
- *
+ *
* @author kane
- *
+ *
* @see User
*/
public interface UserService
{
-
+
/**
* <p>
* Get a {@link User} by the user id
* </p>
- *
+ *
* @param userid
* The userid to search for
* @return A {@link User} object or <code>null</code> if no user was found
@@ -56,16 +56,16 @@
* <p>
* Add a new user
* </p>
- *
+ *
* <p>
* The implementation must ensure that the provided user object is persisted
* before returning the assigned persistent user ID.
* </p>
- *
+ *
* @param user
* The user object to persist
* @return The newly created persistent ID of the user object
- *
+ *
* @see User
*/
public Long addUser(User user) throws EJBException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/model/User.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/model/User.java
index 59450f1..48009de 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/model/User.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/model/User.java
@@ -23,9 +23,9 @@
/**
* A user login account within our system.
- *
+ *
* @author kane
- *
+ *
* @since 0.1
*/
public interface User
@@ -35,7 +35,7 @@
/**
* Get the value of firstName
- *
+ *
* @return the value of firstName
*/
public String getFirstName();
@@ -44,19 +44,19 @@
* <p>
* Get the gender for the user
* </p>
- *
+ *
* <p>
* A gender is much better suited to our needs here as the pure biological
* sex is.
* </p>
- *
+ *
* @return the value of gender
*/
public Gender getGender();
/**
* Get the value of lastName
- *
+ *
* @return the value of lastName
*/
public String getLastName();
@@ -65,7 +65,7 @@
* <p>
* Get the username used for login
* </p>
- *
+ *
* @return the value of username
*/
public String getUsername();
@@ -74,7 +74,7 @@
* <p>
* Get the email address of the user
* </p>
- *
+ *
* @return the value of the email
*/
public String getEmailAddress();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
index ad8e6db..02136e5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
@@ -32,7 +32,7 @@
* <p>
* Implementation of the UserService.
* </p>
- *
+ *
* @author chaoslayer
*/
@Stateless
@@ -45,16 +45,16 @@
* <p>
* Add a new user
* </p>
- *
+ *
* <p>
* The implementation must ensure that the provided user object is persisted
* before returning the assigned persistent user ID.
* </p>
- *
+ *
* @param user
* The user object to persist
* @return The newly created persistent ID of the user object
- *
+ *
* @see UserImpl
*/
@Override
@@ -69,7 +69,7 @@
* <p>
* Get a {@link User} by the user id
* </p>
- *
+ *
* @param userid
* The userid to search for
* @return A {@link User} object or <code>null</code> if no user was found
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/model/UserImpl.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/model/UserImpl.java
index 07ae9b7..1e734e3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/model/UserImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/model/UserImpl.java
@@ -28,7 +28,7 @@
* <p>
* Client-side implementation of {@link User}.
* </p>
- *
+ *
* @author chaoslayer
*/
public class UserImpl implements User
@@ -55,7 +55,7 @@
* <p>
* Get the username used for login
* </p>
- *
+ *
* @return the value of username
*/
public String getUsername()
@@ -67,7 +67,7 @@
* <p>
* Set the username
* </p>
- *
+ *
* @param username
* new value of username
*/
@@ -80,12 +80,12 @@
* <p>
* Get the gender for the user
* </p>
- *
+ *
* <p>
* A gender is much better suited to our needs here as the pure biological
* sex is.
* </p>
- *
+ *
* @return the value of gender
*/
public Gender getGender()
@@ -97,12 +97,12 @@
* <p>
* Set the gender for the user
* </p>
- *
+ *
* <p>
* A gender is much better suited to our needs here as the pure biological
* sex is.
* </p>
- *
+ *
* @param gender
* new value of gender
*/
@@ -113,7 +113,7 @@
/**
* Get the value of firstName
- *
+ *
* @return the value of firstName
*/
public String getFirstName()
@@ -123,7 +123,7 @@
/**
* Set the value of firstName
- *
+ *
* @param firstName
* new value of firstName
*/
@@ -134,7 +134,7 @@
/**
* Get the value of lastName
- *
+ *
* @return the value of lastName
*/
public String getLastName()
@@ -144,7 +144,7 @@
/**
* Set the value of lastName
- *
+ *
* @param lastName
* new value of lastName
*/
@@ -155,7 +155,7 @@
/**
* Get the value of emailAddress
- *
+ *
* @return the value of emailAddress
*/
public String getEmailAddress()
@@ -165,7 +165,7 @@
/**
* Set the value of emailAddress
- *
+ *
* @param emailAddress
* new value of emailAddress
*/
@@ -176,7 +176,7 @@
/**
* String representation of the object data
- *
+ *
* @return The object data as String
*/
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/build.xml
index 9b021d2..9c3bc0f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/build.xml
@@ -84,7 +84,7 @@
<ant dir="jpa-resource-injection-with-singleton-ejb-producer" target="${javaee-comp-target}"/>
<ant dir="no-interface-ejb" target="${javaee-comp-target}"/>
<ant dir="jms-resource-producer-field" target="${javaee-comp-target}"/>
-<!-- TODO: Investigate
+<!-- TODO: Investigate
<ant dir="jms-resource-producer-field-in-library-jar" target="${javaee-comp-target}"/>
-->
<ant dir="em-resource-injection" target="${javaee-comp-target}"/>
@@ -95,15 +95,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the javaee-comp tests)
- ant clean (cleans all the javaee-comp tests)
- ant build (builds all the javaee-comp tests)
- ant setup (sets up all resources for javaee-comp tests)
- ant deploy (deploys all the javaee-comp apps)
- ant run (Executes all the javaee-comp tests)
- ant undeploy (undeploys all the javaee-comp apps)
- ant unsetup (unsets all resources for javaee-comp tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the javaee-comp tests)
+ ant clean (cleans all the javaee-comp tests)
+ ant build (builds all the javaee-comp tests)
+ ant setup (sets up all resources for javaee-comp tests)
+ ant deploy (deploys all the javaee-comp apps)
+ ant run (Executes all the javaee-comp tests)
+ ant undeploy (undeploys all the javaee-comp apps)
+ ant unsetup (unsets all resources for javaee-comp tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/build.properties
index 2696b45..d4afee9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/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}-eminjection-into-no-interface-ejb"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/build.xml
index a0e6a9d..2824b58 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/build.xml
@@ -33,54 +33,54 @@
<target name="all" depends="build,deploy,run,undeploy" />
- <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="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="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-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestBeanSuper.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestBeanSuper.java
index 0116525..b8f0b65 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestBeanSuper.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestBeanSuper.java
@@ -22,7 +22,7 @@
import test.ejb.TestNoInterfaceEJB;
abstract class TestBeanSuper implements TestBeanInterface {
-
+
abstract TestNoInterfaceEJB getTestEJB();
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
index ec4e65f..b8c77de 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
@@ -22,7 +22,7 @@
@Stateless
public class TestNoInterfaceEJB extends TestSuperClass {
- @Inject
+ @Inject
EntityManager em;
public String m2() {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
index 3d3829f..49dc474 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
@@ -84,7 +84,7 @@
if (!status) msg += "Injection and use of EntityMaanger failed";
status = jt.lazyLoadingByFind(1);
if (!status) msg += "Injection and use of EntityMaanger lazy loading test failed";
-
+
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/build.properties
index b2a8756..624d1ee 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/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}-em-resource-injection-extended-transactional-context"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/build.xml
index 295d086..eb790bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/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-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/TestBeanInterface.java
index 29e137a..e5be4d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/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-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/nonmock/TestBean.java
index b047b3d..01def46 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/nonmock/TestBean.java
@@ -30,8 +30,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-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java
index a2320bd..ecd907a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -48,7 +48,7 @@
private @Resource
UserTransaction utx;
-
+
@Inject
@Preferred
TestBeanInterface tbi;
@@ -60,11 +60,11 @@
writer.write("Hello from Servlet 3.0.");
String msg = "";
System.out.println("JPAResourceInjectionServlet::@PersistenceUnit " +
- "CDI EntityManagerFactory=" + emf1);
+ "CDI EntityManagerFactory=" + emf1);
EntityManager em = emf1;
System.out.println("JPAResourceInjectionServlet::createEM" +
- "EntityManager=" + em);
+ "EntityManager=" + em);
String testcase = request.getParameter("testcase");
System.out.println("testcase=" + testcase);
@@ -78,7 +78,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-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JPAResourceProducer.java
index e28d8a9..1cbfefe 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JPAResourceProducer.java
@@ -25,7 +25,7 @@
@Singleton
public class JPAResourceProducer {
@Produces @PersistenceContext(unitName="pu1", type=PersistenceContextType.EXTENDED)
- //@TestDatabase
+ //@TestDatabase
EntityManager customerDatabasePersistenceUnit;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/build.properties
index 1bc0c2e..a82f7b1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/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-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/build.xml
index d3106fb..adb0585 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/build.xml
@@ -34,13 +34,13 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="lib"/>
</antcall>
-
+
<antcall target="compile-common">
<param name="src" value="ejb"/>
</antcall>
@@ -49,7 +49,7 @@
<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 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>
@@ -92,7 +92,7 @@
<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="${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}" >
@@ -101,24 +101,24 @@
<include name="*.war"/>
</fileset>
<fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
+ <include name="META-INF/sun-application.xml"/>
<include name="META-INF/glassfish-resources.xml"/>
</fileset>
<!--
<fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
-->
<fileset dir="${build.classes.dir}" includes="lib-dir/*"/>
- </ear>
+ </ear>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
<target name="run" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -127,10 +127,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-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/client/com/acme/Client.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/client/com/acme/Client.java
index 210fc0f..b5ca4bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/client/com/acme/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/client/com/acme/Client.java
@@ -30,7 +30,7 @@
private static final String TEST_NAME = "em-resource-injection-with-resource-declaration-in-another-jar";
- 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-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java
index d22dc82..bc4a286 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java
@@ -40,7 +40,7 @@
@PersistenceUnit(unitName = "pu1")
@TestDatabase
private EntityManagerFactory emf;
-
+
@PostConstruct
private void init() {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/Singleton4.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/Singleton4.java
index a54c59e..6aa1f24 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/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-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/ResourcesProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/ResourcesProducer.java
index ea029ac..96e2d0a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/ResourcesProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/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-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestDependentBeanInLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestDependentBeanInLib.java
index 9596b22..61d49b6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestDependentBeanInLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/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-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestManagedBean.java
index 5d85a0f..8c50b68 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestManagedBean.java
@@ -23,7 +23,7 @@
public class TestManagedBean {
@Inject
private TestDependentBeanInLib tdbl;
-
+
public boolean isInjectionSuccessful(){
return tdbl != null;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
index f6a904d..6f873e5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
@@ -41,56 +41,56 @@
@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;
-
+
@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.HELLO_TEST_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");
-
+
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-component-resources/em-resource-injection/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/build.properties
index 0411ec9..72e3424 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-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}-em-resource-injection"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/build.xml
index 295d086..eb790bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/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-component-resources/em-resource-injection/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/TestBeanInterface.java
index 29e137a..e5be4d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-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-component-resources/em-resource-injection/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/nonmock/TestBean.java
index b047b3d..01def46 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/nonmock/TestBean.java
@@ -30,8 +30,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-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
index 4189144..1ed7011 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -47,7 +47,7 @@
private @Resource
UserTransaction utx;
-
+
@Inject
@Preferred
TestBeanInterface tbi;
@@ -59,11 +59,11 @@
writer.write("Hello from Servlet 3.0.");
String msg = "";
System.out.println("JPAResourceInjectionServlet::@PersistenceUnit " +
- "CDI EntityManagerFactory=" + emf_at_inj);
+ "CDI EntityManagerFactory=" + emf_at_inj);
EntityManager em = emf_at_inj;
System.out.println("JPAResourceInjectionServlet::createEM" +
- "EntityManager=" + em);
+ "EntityManager=" + em);
String testcase = request.getParameter("testcase");
System.out.println("testcase=" + testcase);
@@ -77,7 +77,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-component-resources/em-resource-injection/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JPAResourceProducer.java
index 984b47d..3a09a7b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JPAResourceProducer.java
@@ -26,7 +26,7 @@
@Singleton
public class JPAResourceProducer {
@Produces @PersistenceContext(unitName="pu1")
- //@TestDatabase
+ //@TestDatabase
EntityManager customerDatabasePersistenceUnit;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/build.properties
index 3543e4c..72176d6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-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}-typesafe-javaee-resource-injection"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/build.xml
index 295d086..eb790bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/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-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/TestBeanInterface.java
index 29e137a..e5be4d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-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-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/nonmock/TestBean.java
index 338a3bf..b46dd27 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/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-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/DatabaseManager.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/DatabaseManager.java
index 6c595cd..257feaa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/DatabaseManager.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/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-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/TypesafeJavaEEResourceInjectionTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/TypesafeJavaEEResourceInjectionTestServlet.java
index d28273c..8bd32d4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/TypesafeJavaEEResourceInjectionTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/TypesafeJavaEEResourceInjectionTestServlet.java
@@ -36,27 +36,27 @@
@Inject
@Preferred
TestBeanInterface tb;
-
+
@Inject @TestDatabase
DataSource ds;
-
+
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
PrintWriter writer = res.getWriter();
writer.write("Hello from Servlet 3.0.");
String msg = "";
-
+
if (ds == null)
msg += "typesafe Injection of datasource into a servlet failed";
if (tb == null)
msg += "Injection of request scoped bean failed";
-
+
if (tb.testDatasourceInjection().trim().length() != 0)
msg += tb.testDatasourceInjection();
-
+
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/build.properties
index 4806149..7331cca 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/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}-jms-resource-injection-in-library-bean-archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/build.xml
index 8df2c24..60d4240 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/build.xml
@@ -33,15 +33,15 @@
<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">
+ <target name="compile" depends="clean">
<!-- compile and create library jar -->
<mkdir dir="tmp"/>
<mkdir dir="tmp/META-INF"/>
@@ -57,34 +57,34 @@
</jar>
<echo message="created library jar at lib/producer-library.jar"/>
- <antcall target="compile-common">
- <param name="src" value="servlet" />
- </antcall>
- </target>
+ <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="asadmin-batch-common">
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -92,24 +92,24 @@
</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 name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
<delete file="lib/producer-library.jar"/>
- </target>
+ </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-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/TestBeanInterface.java
index 29e137a..e5be4d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/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-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/nonmock/TestBean.java
index 5daaf34..d30e1c1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/nonmock/TestBean.java
@@ -28,8 +28,8 @@
@Preferred
public class TestBean implements TestBeanInterface{
public static boolean testBeanInvoked = false;
-
- @Inject
+
+ @Inject
Queue ds;
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java
index 63ff52d..00da215 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java
@@ -36,29 +36,29 @@
@Inject
@Preferred
TestBeanInterface tb;
-
+
@Inject
private Queue queue;
@Inject
private Session session;
-
+
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
PrintWriter writer = res.getWriter();
writer.write("Hello from Servlet 3.0.");
String msg = "";
-
+
if (queue == null)
msg += "typesafe Injection of queue into a servlet failed";
if (session == null)
msg += "typesafe Injection of Session into a servlet failed";
-
+
if (tb == null)
msg += "Injection of request scoped bean failed";
-
+
if (tb.testDatasourceInjection().trim().length() != 0)
msg += tb.testDatasourceInjection();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/build.properties
index 65a6203..765a592 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/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}-jms-resource-injection"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/build.xml
index 1380e6b..9693dfd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/build.xml
@@ -33,43 +33,43 @@
<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="asadmin-batch-common">
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -77,23 +77,23 @@
</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="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-component-resources/jms-resource-producer-field/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/TestBeanInterface.java
index 29e137a..e5be4d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/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-component-resources/jms-resource-producer-field/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/nonmock/TestBean.java
index 5daaf34..d30e1c1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/nonmock/TestBean.java
@@ -28,8 +28,8 @@
@Preferred
public class TestBean implements TestBeanInterface{
public static boolean testBeanInvoked = false;
-
- @Inject
+
+ @Inject
Queue ds;
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java
index 63ff52d..00da215 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java
@@ -36,29 +36,29 @@
@Inject
@Preferred
TestBeanInterface tb;
-
+
@Inject
private Queue queue;
@Inject
private Session session;
-
+
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
PrintWriter writer = res.getWriter();
writer.write("Hello from Servlet 3.0.");
String msg = "";
-
+
if (queue == null)
msg += "typesafe Injection of queue into a servlet failed";
if (session == null)
msg += "typesafe Injection of Session into a servlet failed";
-
+
if (tb == null)
msg += "Injection of request scoped bean failed";
-
+
if (tb.testDatasourceInjection().trim().length() != 0)
msg += tb.testDatasourceInjection();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/build.properties
index fa73b33..6bead55 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-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}-jpa-resource-injection-non-serializable"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/build.xml
index 295d086..eb790bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-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-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/TestBeanInterface.java
index 29e137a..e5be4d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/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-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/nonmock/TestBean.java
index 6009be5..07655df 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/nonmock/TestBean.java
@@ -32,11 +32,11 @@
@Preferred
public class TestBean implements TestBeanInterface, Serializable{
public static boolean testBeanInvoked = false;
-
- @Inject @TestDatabase
+
+ @Inject @TestDatabase
EntityManagerFactory emf;
- //Inject a non-serializable resource
+ //Inject a non-serializable resource
@Inject @TestDatabase
EntityManager em;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java
index 3247750..9b84718 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -48,7 +48,7 @@
private @Resource
UserTransaction utx;
-
+
@Inject
@Preferred
TestBeanInterface tbi;
@@ -60,11 +60,11 @@
writer.write("Hello from Servlet 3.0.");
String msg = "";
System.out.println("JPAResourceInjectionServlet::@PersistenceUnit " +
- "CDI EntityManagerFactory=" + emf1);
+ "CDI EntityManagerFactory=" + emf1);
EntityManager em = emf1.createEntityManager();
System.out.println("JPAResourceInjectionServlet::createEM" +
- "EntityManager=" + em);
+ "EntityManager=" + em);
String testcase = request.getParameter("testcase");
System.out.println("testcase=" + testcase);
@@ -78,7 +78,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-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JPAResourceProducer.java
index 9917aca..57b4218 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JPAResourceProducer.java
@@ -28,10 +28,10 @@
@Singleton
public class JPAResourceProducer {
@Produces @PersistenceUnit(unitName="pu2")
- @TestDatabase
+ @TestDatabase
EntityManagerFactory customerDatabasePersistenceUnit;
@Produces @PersistenceContext(unitName="pu2")
- @TestDatabase
+ @TestDatabase
EntityManager customerDatabasePersistenceContext;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/build.properties
index 87af1eb..09ce2b0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/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}-jpa-resource-injection-passivating-scope"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/build.xml
index 295d086..eb790bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/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-component-resources/jpa-resource-injection-passivating-scope/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/beans/TestBeanInterface.java
index 29e137a..e5be4d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/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-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java
index 6201f70..2f06004 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -49,7 +49,7 @@
private @Resource
UserTransaction utx;
-
+
@Inject
TestEJB tbi;
@@ -60,11 +60,11 @@
writer.write("Hello from Servlet 3.0.");
String msg = "";
System.out.println("JPAResourceInjectionServlet::@PersistenceUnit " +
- "CDI EntityManagerFactory=" + emf1);
+ "CDI EntityManagerFactory=" + emf1);
EntityManager em = emf1.createEntityManager();
System.out.println("JPAResourceInjectionServlet::createEM" +
- "EntityManager=" + em);
+ "EntityManager=" + em);
String testcase = request.getParameter("testcase");
System.out.println("testcase=" + testcase);
@@ -78,7 +78,7 @@
} else if ("llquery".equals(testcase)) {
status = jt.lazyLoadingByQuery("Carla");
} else if ("llinj".equals(testcase)){
- status = ((tbi != null) &&
+ status = ((tbi != null) &&
(tbi.test().length() == 0));
}
if (status) {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JPAResourceProducer.java
index 3a324d6..cec0ffe 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JPAResourceProducer.java
@@ -29,11 +29,11 @@
@Singleton
public class JPAResourceProducer {
@Produces @PersistenceUnit(unitName="pu3")
- @TestDatabase
+ @TestDatabase
EntityManagerFactory customerDatabasePersistenceUnit;
@Produces @PersistenceContext(unitName="pu3")
- @TestDatabase
+ @TestDatabase
EntityManager customerDatabasePersistenceContext;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/build.properties
index e2f195c..da6b70f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/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}-jpa-resource-injection-in-singleton-ejb"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/build.xml
index 295d086..eb790bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/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-component-resources/jpa-resource-injection-with-singleton-ejb-producer/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/client/test/client/WebTest.java
index b474733..0f65d92 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/client/test/client/WebTest.java
@@ -64,7 +64,7 @@
ex.printStackTrace();
}
}
-
+
private void runOneCycle(String whichEMF) throws Exception {
invoke(whichEMF, "llinit");
invoke(whichEMF, "llquery");
@@ -118,8 +118,8 @@
}
}
}
-
+
private String getTestName(String whichEMF, String testCase){
- return TEST_NAME + "_" + whichEMF + "_" +testCase;
+ return TEST_NAME + "_" + whichEMF + "_" +testCase;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/TestBeanInterface.java
index 29e137a..e5be4d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/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-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/nonmock/TestBean.java
index 3dcfa94..6bf387d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/nonmock/TestBean.java
@@ -31,8 +31,8 @@
@Preferred
public class TestBean implements TestBeanInterface{
public static boolean testBeanInvoked = false;
-
- @Inject @ProducedViaProducerMethod
+
+ @Inject @ProducedViaProducerMethod
EntityManagerFactory emf;
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java
index a35e6aa..81f1f38 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java
@@ -27,7 +27,7 @@
public class JPAResourceProducerSingletonEJB_BusinessMethodProducer {
@PersistenceUnit(unitName="pu1")
EntityManagerFactory customerDatabasePersistenceUnit;
-
+
@Produces @ProducedViaProducerMethod
public EntityManagerFactory createEMF(){
return customerDatabasePersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java
index cbdf936..17de7c1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java
@@ -24,6 +24,6 @@
@jakarta.ejb.Singleton
public class JPAResourceProducerSingletonEJB_StaticField {
- @Produces @PersistenceUnit(unitName="pu1") @ProducedViaStaticField
+ @Produces @PersistenceUnit(unitName="pu1") @ProducedViaStaticField
public static EntityManagerFactory customerDatabasePersistenceUnit1;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java
index 8f7b2f9..26652e8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java
@@ -46,15 +46,15 @@
@Inject
@ProducedViaProducerMethod
private EntityManagerFactory emf_producer;
-
+
@Inject
@ProducedViaStaticField
private EntityManagerFactory emf_static;
-
+
private @Resource
UserTransaction utx;
-
+
@Inject
@Preferred
TestBeanInterface tbi;
@@ -65,13 +65,13 @@
PrintWriter writer = response.getWriter();
writer.write("Hello from Servlet 3.0.");
String msg = "";
-
+
if (emf == null)
msg += "Simple injection of EntityManagerFactory through " +
- "@PersistenceUnit failed";
+ "@PersistenceUnit failed";
String testcase = request.getParameter("testcase");
System.out.println("testcase=" + testcase);
-
+
String whichEMF = request.getParameter("whichemf");
System.out.println("whichEMF=" + whichEMF);
@@ -89,9 +89,9 @@
System.out.println("JPAResourceInjectionServlet::createEM" +
"EntityManager=" + em);
}
-
+
if (testcase != null) {
-
+
JpaTest jt = new JpaTest(em, utx);
boolean status = false;
if ("llinit".equals(testcase)) {
@@ -101,10 +101,10 @@
} 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) {
msg += "";// pass
} else {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/build.properties
index 168fae7..1883d46 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-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}-jpa-resource-injection"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/build.xml
index 295d086..eb790bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/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-component-resources/jpa-resource-injection/servlet/test/beans/TestBeanInterface.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/TestBeanInterface.java
index 29e137a..e5be4d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/TestBeanInterface.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-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-component-resources/jpa-resource-injection/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/nonmock/TestBean.java
index 61ca5cf..3f2a4ba 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/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
EntityManagerFactory emf;
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
index dc4e18f..6946ce7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -48,7 +48,7 @@
private @Resource
UserTransaction utx;
-
+
@Inject
@Preferred
TestBeanInterface tbi;
@@ -60,11 +60,11 @@
writer.write("Hello from Servlet 3.0.");
String msg = "";
System.out.println("JPAResourceInjectionServlet::@PersistenceUnit " +
- "CDI EntityManagerFactory=" + emf1);
+ "CDI EntityManagerFactory=" + emf1);
EntityManager em = emf1.createEntityManager();
System.out.println("JPAResourceInjectionServlet::createEM" +
- "EntityManager=" + em);
+ "EntityManager=" + em);
String testcase = request.getParameter("testcase");
System.out.println("testcase=" + testcase);
@@ -78,7 +78,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-component-resources/jpa-resource-injection/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JPAResourceProducer.java
index a7a14ad..89b6b0b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JPAResourceProducer.java
@@ -26,7 +26,7 @@
@Singleton
public class JPAResourceProducer {
@Produces @PersistenceUnit(unitName="pu1")
- @TestDatabase
+ @TestDatabase
EntityManagerFactory customerDatabasePersistenceUnit;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/build.properties
index 5b8ba11..bb7b491 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/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-ejb"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/build.xml
index a0e6a9d..2824b58 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/build.xml
@@ -33,54 +33,54 @@
<target name="all" depends="build,deploy,run,undeploy" />
- <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="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="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-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestBeanSuper.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestBeanSuper.java
index 5a38f90..0235120 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestBeanSuper.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestBeanSuper.java
@@ -20,7 +20,7 @@
import test.ejb.nointerfacebeanview.TestNoInterfaceEJB;
abstract class TestBeanSuper implements TestBeanInterface {
-
+
abstract TestNoInterfaceEJB getTestEJB();
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestSuperClass.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestSuperClass.java
index 4a419c0..61db9fa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestSuperClass.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestSuperClass.java
@@ -18,7 +18,7 @@
import jakarta.enterprise.inject.Alternative;
-
+
//marked as Alternative, otherwise there would
//an ambiguous definition for TestLocalInterface between this
//super class and the TestLocalEJB
@@ -29,7 +29,7 @@
System.out.println("local bean: m1");
return true;
}
-
+
public boolean m2DefinedInSuperClass(){
System.out.println("local: m2");
return true;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java
index d093d1c..d9179cc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java
@@ -18,7 +18,7 @@
import jakarta.enterprise.inject.Alternative;
-
+
public class TestSuperClass implements TestInterface{
@Override
@@ -26,7 +26,7 @@
System.out.println("no interface bean: m1");
return true;
}
-
+
public boolean m2DefinedInSuperClass(){
System.out.println("no interface bean: m2");
return true;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/FooBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/FooBean.java
index 44e1ece..86f8b21 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/FooBean.java
@@ -28,7 +28,7 @@
@InjectViaAtEJB
@NoInterfaceBeanView
TestBeanInterface testBeanEJB;
-
+
public TestBeanInterface getBean(){
return testBeanEJB;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
index df000ca..1dff11a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
@@ -54,45 +54,45 @@
// @InjectViaAtEJB
// @LocalEJB
// TestBeanInterface testLocalBeanEJB;
-
+
@Inject
TestInterface ti;
-
+
@Inject
TestSuperClass ti1;
-
+
protected void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException,
IOException {
PrintWriter writer = response.getWriter();
writer.write("Hello from Servlet 3.0.");
-
+
String msg = "";
//test EJB injection via @EJB
String m = fb.getBean().runTests();
if (!m.equals(""))
msg += "Invocation on no-interface EJB -- obtained through @EJB -- failed. Failed tests" + m;
-
+
//test EJB injection via @Inject
// m = testBeanInject.runTests();
// if (!m.equals(""))
// msg += "Invocation on no-interface EJB -- obtained through @Inject -- failed. Failed tests" + m;
- //test No-Interface EJB injection via @Inject of an interface the
+ //test No-Interface EJB injection via @Inject of an interface the
//no-interface bean is implementing
if (ti != null && !(ti.m1DefinedInInterface()))
msg += "Invocation on no-interface EJB -- obtained through @Inject -- (method defined in super interface) failed";
-
- //test No-Interface EJB injection via @Inject of an interface the
+
+ //test No-Interface EJB injection via @Inject of an interface the
//no-interface bean is implementing
if (ti1 != null && !(ti1.m2DefinedInSuperClass()))
msg += "Invocation on no-interface EJB -- obtained through @Inject -- (method defined in super class) failed";
-
+
//test local EJB injection via @EJB
// m = testLocalBeanEJB.runTests();
// if (!m.equals(""))
// msg += "Invocation on local EJB -- obtained through @EJB -- failed. Failed tests" + m;
-
+
//test EJB injection via @Inject
// m = testLocalBeanInject.runTests();
// if (!m.equals(""))
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/build.properties b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/build.properties
index 5b8ba11..bb7b491 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/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-ejb"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/build.xml
index a0e6a9d..2824b58 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/build.xml
@@ -33,54 +33,54 @@
<target name="all" depends="build,deploy,run,undeploy" />
- <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="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="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-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/TestSessionScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/TestSessionScopedBean.java
index 667a729..4f23da3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/TestSessionScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/TestSessionScopedBean.java
@@ -32,11 +32,11 @@
public TestSessionScopedBean() {
}
-
+
public boolean testSLSBAccess(){
if (statelessSessionBean != null)
return statelessSessionBean.statelessMethod1();
else return false;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestBeanSuper.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestBeanSuper.java
index 5a38f90..0235120 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestBeanSuper.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestBeanSuper.java
@@ -20,7 +20,7 @@
import test.ejb.nointerfacebeanview.TestNoInterfaceEJB;
abstract class TestBeanSuper implements TestBeanInterface {
-
+
abstract TestNoInterfaceEJB getTestEJB();
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestSuperClass.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestSuperClass.java
index 4a419c0..61db9fa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestSuperClass.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestSuperClass.java
@@ -18,7 +18,7 @@
import jakarta.enterprise.inject.Alternative;
-
+
//marked as Alternative, otherwise there would
//an ambiguous definition for TestLocalInterface between this
//super class and the TestLocalEJB
@@ -29,7 +29,7 @@
System.out.println("local bean: m1");
return true;
}
-
+
public boolean m2DefinedInSuperClass(){
System.out.println("local: m2");
return true;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java
index dba28e6..a01c1c6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java
@@ -18,7 +18,7 @@
import jakarta.enterprise.inject.Alternative;
-
+
//marked as Alternative, otherwise there would
//an ambiguous definition for TestLocalInterface between this
//super class and the TestLocalEJB
@@ -29,7 +29,7 @@
System.out.println("no interface bean: m1");
return true;
}
-
+
public boolean m2DefinedInSuperClass(){
System.out.println("no interface bean: m2");
return true;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
index 202d7da..2875d52 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
@@ -26,9 +26,9 @@
public TestSLSB() {
}
-
+
public boolean statelessMethod1(){
return true;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/servlet/SLSBInjectionIntoSessionScopedBeanTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/servlet/SLSBInjectionIntoSessionScopedBeanTestServlet.java
index 4ac9274..def0238 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/servlet/SLSBInjectionIntoSessionScopedBeanTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/servlet/SLSBInjectionIntoSessionScopedBeanTestServlet.java
@@ -57,53 +57,53 @@
@InjectViaAtEJB
@LocalEJB
TestBeanInterface testLocalBeanEJB;
-
+
@Inject
TestInterface ti;
-
+
@Inject
TestSuperClass ti1;
-
+
@Inject
TestSessionScopedBean tssb;
-
+
protected void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException,
IOException {
PrintWriter writer = response.getWriter();
writer.write("Hello from Servlet 3.0.");
-
+
String msg = "";
//test EJB injection via @EJB
String m = testBeanEJB.runTests();
if (!m.equals(""))
msg += "Invocation on no-interface EJB -- obtained through @EJB -- failed. Failed tests" + m;
-
+
//test EJB injection via @Inject
m = testBeanInject.runTests();
if (!m.equals(""))
msg += "Invocation on no-interface EJB -- obtained through @Inject -- failed. Failed tests" + m;
- //test No-Interface EJB injection via @Inject of an interface the
+ //test No-Interface EJB injection via @Inject of an interface the
//no-interface bean is implementing
if (ti != null && !(ti.m1DefinedInInterface()))
msg += "Invocation on no-interface EJB -- obtained through @Inject -- (method defined in super interface) failed";
-
- //test No-Interface EJB injection via @Inject of an interface the
+
+ //test No-Interface EJB injection via @Inject of an interface the
//no-interface bean is implementing
if (ti1 != null && !(ti1.m2DefinedInSuperClass()))
msg += "Invocation on no-interface EJB -- obtained through @Inject -- (method defined in super class) failed";
-
+
//test local EJB injection via @EJB
m = testLocalBeanEJB.runTests();
if (!m.equals(""))
msg += "Invocation on local EJB -- obtained through @EJB -- failed. Failed tests" + m;
-
+
//test EJB injection via @Inject
m = testLocalBeanInject.runTests();
if (!m.equals(""))
msg += "Invocation on local EJB -- obtained through @Inject -- failed. Failed tests" + m;
-
+
if (!tssb.testSLSBAccess())
msg += "Stateless Session Bean into session scoped bean failed";
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;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/build.xml b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/build.xml
index 5476c34..9aec1c7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/build.xml
@@ -86,15 +86,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the managedbeans tests)
- ant clean (cleans all the managedbeans tests)
- ant build (builds all the managedbeans tests)
- ant setup (sets up all resources for managedbeans tests)
- ant deploy (deploys all the managedbeans apps)
- ant run (Executes all the managedbeans tests)
- ant undeploy (undeploys all the managedbeans apps)
- ant unsetup (unsets all resources for managedbeans tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the managedbeans tests)
+ ant clean (cleans all the managedbeans tests)
+ ant build (builds all the managedbeans tests)
+ ant setup (sets up all resources for managedbeans tests)
+ ant deploy (deploys all the managedbeans apps)
+ ant run (Executes all the managedbeans tests)
+ ant undeploy (undeploys all the managedbeans apps)
+ ant unsetup (unsets all resources for managedbeans tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/WebTest.java
index e736b97..1ee076f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebServlet");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -64,7 +64,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -103,10 +103,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/managed-beans/managed-bean-lifecycle-polymorphism/build.properties b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/build.properties
index c0f20bb..b65705e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/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}-managed-bean-lifecycle-polymorphism"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/build.xml b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/build.xml
index 0a72e12..24a4c8f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/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/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestAroundInvokeInterceptor.java
index a3f72bc..d167c96 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestAroundInvokeInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestAroundInvokeInterceptor.java
@@ -26,7 +26,7 @@
aroundInvokeCount = 0;
}
- @AroundInvoke
+ @AroundInvoke
public Object testMethod(InvocationContext ctx) throws Exception {
System.out.println("TestAroundInvokeInterceptor:: aroundInvoke called - target:" + ctx.getTarget() + " , params:"+ ctx.getParameters());
aroundInvokeCount ++;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestManagedBean.java
index a28a72d..e093bea 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestManagedBean.java
@@ -64,7 +64,7 @@
public String getPostConstructMessage() {
return postConstructMessage;
}
-
+
public String getPreDestroyMessage() {
return preDestroyMessage;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestManagedBeanExtension.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestManagedBeanExtension.java
index 9d71d57..014c9fe 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestManagedBeanExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestManagedBeanExtension.java
@@ -36,7 +36,7 @@
System.out.println(preDestroyMessage);
}
-
+
@Override
public String toString() {
return TOSTRING_EXT;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/WebTest.java
index 6a28a08..cc8507f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebServlet");
WebTest webTest = new WebTest(args);
@@ -51,7 +51,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -61,7 +61,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -100,10 +100,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/managed-beans/managed-bean-via-resource-injection/build.properties b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/build.properties
index 91ab983..b5a7f33 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-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}-simple-managed-bean-interceptor"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/build.xml b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/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/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestAroundInvokeInterceptor.java
index 590431d..d5eeb7c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestAroundInvokeInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestAroundInvokeInterceptor.java
@@ -26,7 +26,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/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestManagedBean.java
index cf49cb2..c319eb3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestManagedBean.java
@@ -16,7 +16,7 @@
package com.tests;
-//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/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestServlet.java
index 6aec84e..ce22666 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestServlet.java
@@ -50,7 +50,7 @@
private String testOverriddenMethods() {
String s = "";
System.out.println("toString returned:" +testResource.toString());
- if (!testResource.toString().equals(TestManagedBean.TOSTRING))
+ if (!testResource.toString().equals(TestManagedBean.TOSTRING))
s += "TestManagedBean obtained via @Resource toString method invocation failed";
return s;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/open-issues/build.xml b/appserver/tests/appserv-tests/devtests/cdi/open-issues/build.xml
index 3488ae8..1a63761 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/open-issues/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/open-issues/build.xml
@@ -85,15 +85,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the openissues tests)
- ant clean (cleans all the openissues tests)
- ant build (builds all the openissues tests)
- ant setup (sets up all resources for openissues tests)
- ant deploy (deploys all the openissues apps)
- ant run (Executes all the openissues tests)
- ant undeploy (undeploys all the openissues apps)
- ant unsetup (unsets all resources for openissues tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the openissues tests)
+ ant clean (cleans all the openissues tests)
+ ant build (builds all the openissues tests)
+ ant setup (sets up all resources for openissues tests)
+ ant deploy (deploys all the openissues apps)
+ ant run (Executes all the openissues tests)
+ ant undeploy (undeploys all the openissues apps)
+ ant unsetup (unsets all resources for openissues tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/build.xml b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/build.xml
index bc0588f..0a21da2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/build.xml
@@ -82,15 +82,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the osgi-cdi tests)
- ant clean (cleans all the osgi-cdi tests)
- ant build (builds all the osgi-cdi tests)
- ant setup (sets up all resources for osgi-cdi tests)
- ant deploy (deploys all the osgi-cdi apps)
- ant run (Executes all the osgi-cdi tests)
- ant undeploy (undeploys all the osgi-cdi apps)
- ant unsetup (unsets all resources for osgi-cdi tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the osgi-cdi tests)
+ ant clean (cleans all the osgi-cdi tests)
+ ant build (builds all the osgi-cdi tests)
+ ant setup (sets up all resources for osgi-cdi tests)
+ ant deploy (deploys all the osgi-cdi apps)
+ ant run (Executes all the osgi-cdi tests)
+ ant undeploy (undeploys all the osgi-cdi apps)
+ ant unsetup (unsets all resources for osgi-cdi tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml
index f342d87..92f55e4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml
@@ -17,24 +17,24 @@
-->
<!--
- This is the top level build file that should be
- imported into all the leaf level build files
+ This is the top level build file that should be
+ imported into all the leaf level build files
-->
<!-- ================================================================ -->
<!-- Targets to clean class files and jars files -->
-<!--
-Variables used:
- ${build.classes.dir}
+<!--
+Variables used:
+ ${build.classes.dir}
${assemble.dir}
-->
<!-- ================================================================ -->
<target name="clean-classes-common" depends="init-common">
- <echo message="common.xml: Cleaning test source files: ${build.base.dir}"
+ <echo message="common.xml: Cleaning test source files: ${build.base.dir}"
level="verbose"/>
<delete dir="${build.base.dir}"/>
</target>
-
+
<target name="clean-jars-common" depends="init-common">
<delete dir="${assemble.dir}"/>
</target>
@@ -46,9 +46,9 @@
<!-- ================================================================ -->
<!-- Target to compile the java source files -->
-<!--
-Variables used:
- ${build.classes.dir}
+<!--
+Variables used:
+ ${build.classes.dir}
${s1astest.classpath}
${src}
-->
@@ -75,7 +75,7 @@
Variables Used:
${war.file}
${build.classes.dir}
- ${appname}
+ ${appname}
${assemble.dir}
${web.xml}
${beans.xml}
@@ -106,17 +106,17 @@
<target name="publish-war-common" depends="init-common">
<mkdir dir="${build.webapps.dir}"/>
- <copy file="${assemble.dir}/${appname}-web.war"
- tofile="${build.webapps.dir}/${appname}.war"
+ <copy file="${assemble.dir}/${appname}-web.war"
+ tofile="${build.webapps.dir}/${appname}.war"
overwrite="true" />
</target>
<target name="clean-webapps-common" depends="init-common">
- <delete dir="${build.webapps.dir}" quiet="true" />
+ <delete dir="${build.webapps.dir}" quiet="true" />
</target>
<target name="clear">
- <delete file="${war.file}"/>
+ <delete file="${war.file}"/>
</target>
<target name="copy-tlds" if="tlds-exist" depends="clear,test-tlds-exist">
@@ -145,13 +145,13 @@
<mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF/lib"/>
<mkdir dir="lib"/>
- <copy file="${glassfish-web.xml}"
+ <copy file="${glassfish-web.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/glassfish-web.xml" failonerror="false"/>
- <copy file="${sun-web.xml}"
+ <copy file="${sun-web.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/sun-web.xml" failonerror="false"/>
- <copy file="${weblogic.xml}"
+ <copy file="${weblogic.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/weblogic.xml" failonerror="false"/>
- <copy file="${glassfish-resources.xml}"
+ <copy file="${glassfish-resources.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/glassfish-resources.xml" failonerror="false"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF/lib" failonerror="false">
<fileset dir="lib">
@@ -159,32 +159,32 @@
<include name="**/*.zip"/>
</fileset>
</copy>
- <copy file="${webservices.xml}"
+ <copy file="${webservices.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/webservices.xml"
failonerror="false"/>
- <copy file="${mappingfile.location}/${mappingfile.name}"
+ <copy file="${mappingfile.location}/${mappingfile.name}"
tofile="${build.classes.dir}/tmp/${mappingfile.name}"
failonerror="false"/>
- <copy file="${wsdlfile.location}/${wsdlfile.name}"
+ <copy file="${wsdlfile.location}/${wsdlfile.name}"
tofile="${build.classes.dir}/tmp/WEB-INF/wsdl/${wsdlfile.name}"
failonerror="false"/>
- <copy file="${tagPlugins.xml}"
+ <copy file="${tagPlugins.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/tagPlugins.xml"
failonerror="false"/>
- <copy file="${web.xml}"
+ <copy file="${web.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/web.xml"
failonerror="false"/>
- <copy file="${persistence.xml}"
+ <copy file="${persistence.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/persistence.xml"
failonerror="false"/>
- <copy file="${beans.xml}"
+ <copy file="${beans.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/beans.xml"
failonerror="false"/>
<copy file="${context.xml}"
tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
<copy file="${cdi-extension.service}"
tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension" failonerror="false"/>
-
+
<copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
<fileset dir="${war.classes}">
<include name="**/*.class"/>
@@ -229,10 +229,10 @@
<include name="WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
<include name="WEB-INF/classes/META-INF/persistence.xml"/>
</fileset>
- </jar>
+ </jar>
<echo message="created war file ${war.file}" level="verbose"/>
- <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
- <echo message="my webclient war classes are:${webclient.war.classes}"
+ <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
+ <echo message="my webclient war classes are:${webclient.war.classes}"
level="verbose"/>
</target>
@@ -244,13 +244,13 @@
<mkdir dir="${build.classes.dir}/tmp/WEB-INF/lib"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF/META-INF"/>
<mkdir dir="lib"/>
- <copy file="${glassfish-web.xml}"
+ <copy file="${glassfish-web.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/glassfish-web.xml" failonerror="false"/>
- <copy file="${sun-web.xml}"
+ <copy file="${sun-web.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/sun-web.xml" failonerror="false"/>
- <copy file="${weblogic.xml}"
+ <copy file="${weblogic.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/weblogic.xml" failonerror="false"/>
- <copy file="${glassfish-resources.xml}"
+ <copy file="${glassfish-resources.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/glassfish-resources.xml" failonerror="false"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF/lib" failonerror="false">
<fileset dir="lib">
@@ -258,36 +258,36 @@
<include name="**/*.zip"/>
</fileset>
</copy>
- <copy file="${webservices.xml}"
+ <copy file="${webservices.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/webservices.xml"
failonerror="false"/>
- <copy file="${mappingfile.location}/${mappingfile.name}"
+ <copy file="${mappingfile.location}/${mappingfile.name}"
tofile="${build.classes.dir}/tmp/${mappingfile.name}"
failonerror="false"/>
- <copy file="${wsdlfile.location}/${wsdlfile.name}"
+ <copy file="${wsdlfile.location}/${wsdlfile.name}"
tofile="${build.classes.dir}/tmp/WEB-INF/wsdl/${wsdlfile.name}"
failonerror="false"/>
- <copy file="${tagPlugins.xml}"
+ <copy file="${tagPlugins.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/tagPlugins.xml"
failonerror="false"/>
- <copy file="${web.xml}"
+ <copy file="${web.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/web.xml"
failonerror="false"/>
- <copy file="${persistence.xml}"
+ <copy file="${persistence.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/persistence.xml"
failonerror="false"/>
- <copy file="${beans.xml}"
+ <copy file="${beans.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/beans.xml"
failonerror="false"/>
- <copy file="${bundle.descriptor}"
+ <copy file="${bundle.descriptor}"
tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/MANIFEST.MF"
failonerror="false"/>
<copy file="${context.xml}"
tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
<copy file="${cdi-extension.service}"
tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension" failonerror="false"/>
-
+
<copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
<fileset dir="${war.classes}">
<include name="**/*.class"/>
@@ -332,10 +332,10 @@
<include name="WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
<include name="WEB-INF/classes/META-INF/persistence.xml"/>
</fileset>
- </jar>
+ </jar>
<echo message="created WAB file ${war.file}" level="verbose"/>
- <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
- <echo message="my webclient WAB classes are:${webclient.war.classes}"
+ <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
+ <echo message="my webclient WAB classes are:${webclient.war.classes}"
level="verbose"/>
</target>
@@ -354,35 +354,35 @@
Variables Used:
${ejb.jar}
${build.classes.dir}
- ${ejb-jar.xml}
+ ${ejb-jar.xml}
${beans.xml}
- ${persistence-orm.xml}
- ${sun-ejb-jar.xml}
- ${glassfish-ejb-jar.xml}
- ${sun-cmp-mappings.xml}
- ${metainf.dir}
+ ${persistence-orm.xml}
+ ${sun-ejb-jar.xml}
+ ${glassfish-ejb-jar.xml}
+ ${sun-cmp-mappings.xml}
+ ${metainf.dir}
${ejbjar.files}
${dbschema}
-->
<!-- ================================================================ -->
<target name="package-ejbjar-common">
<delete file="${ejb.jar}"/>
- <echo message="common.xml: Generating ejb-jar inside build directory"
+ <echo message="common.xml: Generating ejb-jar inside build directory"
level="verbose"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${ejb-jar.xml}"
+ <copy file="${ejb-jar.xml}"
tofile="${build.classes.dir}/META-INF/ejb-jar.xml"
failonerror="false"/>
- <copy file="${persistence-orm.xml}"
+ <copy file="${persistence-orm.xml}"
tofile="${build.classes.dir}/META-INF/persistence-orm.xml"
failonerror="false"/>
- <copy file="${webservices.xml}"
+ <copy file="${webservices.xml}"
tofile="${build.classes.dir}/META-INF/webservices.xml"
failonerror="false"/>
- <copy file="${sun-ejb-jar.xml}"
+ <copy file="${sun-ejb-jar.xml}"
tofile="${build.classes.dir}/META-INF/sun-ejb-jar.xml"
failonerror="false"/>
- <copy file="${glassfish-ejb-jar.xml}"
+ <copy file="${glassfish-ejb-jar.xml}"
tofile="${build.classes.dir}/META-INF/glassfish-ejb-jar.xml"
failonerror="false"/>
<copy file="${glassfish-resources.xml}"
@@ -407,42 +407,42 @@
<include name="sun-cmp-mappings.xml"/>
<include name="beans.xml"/>
</metainf>
- </jar>
+ </jar>
<delete dir="${build.classes.dir}/META-INF" failonerror="false"/>
<delete file="${build.classes.dir}/*.dbschema" failonerror="false"/>
-</target>
+</target>
<!-- ================================================================ -->
<!-- Target to package the appclient application to jar file -->
<!--
Variables Used:
${appclient.jar}
- ${appclientjar.classes}
- ${appclientjar.files}
+ ${appclientjar.classes}
+ ${appclientjar.files}
${build.classes.dir}
- ${application-client.xml}
- ${sun-application-client.xml}
+ ${application-client.xml}
+ ${sun-application-client.xml}
-->
<!-- ================================================================ -->
<target name="package-appclientjar-common">
<delete file="${appclient.jar}"/>
- <echo message="common.xml: Generating appclient-jar inside build directory"
+ <echo message="common.xml: Generating appclient-jar inside build directory"
level="verbose"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
<copy file="${application-client.xml}"
- tofile="${build.classes.dir}/META-INF/application-client.xml"
+ tofile="${build.classes.dir}/META-INF/application-client.xml"
failonerror="false"/>
<copy file="${sun-application-client.xml}" tofile="${build.classes.dir}/META-INF/sun-application-client.xml"
failonerror="false"/>
- <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
- update="true" includes ="${appclientjar.classes}"
- manifest="./client/MANIFEST.MF">
+ <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
+ update="true" includes ="${appclientjar.classes}"
+ manifest="./client/MANIFEST.MF">
<metainf dir="${build.classes.dir}/META-INF">
<include name="application-client.xml"/>
<include name="sun-application-client.xml"/>
</metainf>
- </jar>
-</target>
+ </jar>
+</target>
<!-- ================================================================ -->
<!-- Target to create the ejb application jar file -->
@@ -453,7 +453,7 @@
<param name="ejbjar.files" value="${build.classes.dir}"/>
<param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
</antcall>
-</target>
+</target>
<!-- ================================================================ -->
<!-- Target to create the appclient jar file -->
@@ -461,9 +461,9 @@
<target name="appclient-jar-common" depends="init-common">
<mkdir dir="${assemble.dir}"/>
<antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
+ <param name="appclientjar.files"
value="${build.classes.dir}"/>
- <param name="appclient.jar"
+ <param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
</antcall>
</target>
@@ -492,22 +492,22 @@
<target name="build-ear-common" depends="fixFiles,package-persistence-common,ejb-jar-common,appclient-jar-common,webclient-war-common">
<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="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <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="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
<copy file="${glassfish-resources-ear.xml}" tofile="${build.classes.dir}/META-INF/glassfish-resources.xml" failonerror="false" filtering="true"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
<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/application.xml"/>
+ <include name="META-INF/sun-application.xml"/>
+ <include name="META-INF/application.xml"/>
<include name="META-INF/glassfish-resources.xml"/>
</fileset>
<fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
- </jar>
+ </jar>
</target>
@@ -517,21 +517,21 @@
<target name="ear-common" depends="fixFiles,init-common">
<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"/>
+ <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"
+ <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/sun-application.xml"/>
<include name="META-INF/glassfish-resources.xml"/>
</fileset>
<fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
- </ear>
+ </ear>
</target>
@@ -561,17 +561,17 @@
<echo message="Operand ${operand.props}" level="verbose"/>
<echo message="asadmin ${admin.command} ${as.props} ${operand.props}"/>
<exec executable="${ASADMIN}" failonerror="true">
- <arg line="${admin.command} ${as.props} ${operand.props}" />
+ <arg line="${admin.command} ${as.props} ${operand.props}" />
</exec>
</target>
<target name="asadmin-common-ignore-fail">
- <echo message="Doing admin task ${admin.command} (ignore failures)"
+ <echo message="Doing admin task ${admin.command} (ignore failures)"
level="verbose"/>
<echo message="Operand ${operand.props}" level="verbose"/>
<echo message="asadmin ${admin.command} ${as.props} ${operand.props}"/>
<exec executable="${ASADMIN}" failonerror="false">
- <arg line="${admin.command} ${as.props} ${operand.props}" />
+ <arg line="${admin.command} ${as.props} ${operand.props}" />
</exec>
</target>
@@ -579,7 +579,7 @@
<!-- Target to execute a batchfile of asadmin commands -->
<!-- ================================================================ -->
<target name="asadmin-batch-common">
- <echo message="Doing admin batch task ${admin.command} --file"
+ <echo message="Doing admin batch task ${admin.command} --file"
level="verbose"/>
<property name="user.password.file" value="asadminuserpassword.txt"/>
<echo file="${user.password.file}" append="false">
@@ -590,11 +590,11 @@
</echo>
<exec executable="${ASADMIN}" failonerror="true">
<arg line="--user ${admin.user} --passwordfile ${user.password.file} --host ${admin.host} --port ${admin.port} --echo=true --terse=true"/>
- <arg line="multimode --file ${asadmin.file}" />
+ <arg line="multimode --file ${asadmin.file}" />
</exec>
<delete file="${user.password.file}" failonerror="false"/>
</target>
-
+
<!-- ================================================================ -->
<!-- ================================================================ -->
@@ -618,7 +618,7 @@
</exec>
<delete file="${user.password.file}" failonerror="false"/>
</target>
-
+
<!-- ================================================================ -->
<!-- Target to delete the user in file realm the AppServ -->
<!-- ================================================================ -->
@@ -634,7 +634,7 @@
</target>
<!-- ================================================================ -->
-<!-- J2EE Connector related targets -->
+<!-- J2EE Connector related targets -->
<!-- ================================================================ -->
<target name="create-connector-connpool-common"
@@ -721,7 +721,7 @@
<!-- Target to create JDBC connection pool -->
<!-- ================================================================ -->
<target name="create-jdbc-connpool-common" depends="init-common">
-<echo message="created jdbc connection pool ${jdbc.conpool.name}"
+<echo message="created jdbc connection pool ${jdbc.conpool.name}"
level="verbose"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="create-jdbc-connection-pool"/>
@@ -735,7 +735,7 @@
</target>
<target name="create-jdbc-driver-connpool-common" depends="init-common">
-<echo message="created jdbc connection pool ${jdbc.conpool.name}"
+<echo message="created jdbc connection pool ${jdbc.conpool.name}"
level="verbose"/>
<property name="extra-params" value=""/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -772,7 +772,7 @@
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.URL=${db.url};user=${db.user};password=${db.pwd}"/>
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.URL=${db.url};user=${db.user};password=${db.pwd}"/>
</antcall>
</target>
@@ -823,7 +823,7 @@
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.URL=${db.url};user=${db.user};password=${db.pwd}"/>
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.URL=${db.url};user=${db.user};password=${db.pwd}"/>
</antcall>
</target>
@@ -839,14 +839,14 @@
<arg line="--target ${appserver.instance.name}"/>
<arg line="${jdbc.conpool.name}"/>
</exec>
- <echo message="cmd executed for ${appserver.instance.name}"/>
+ <echo message="cmd executed for ${appserver.instance.name}"/>
</target>
<!-- ================================================================ -->
<!-- Target to create JDBC resource -->
<!-- ================================================================ -->
<target name="create-jdbc-resource-common" depends="init-common">
-<echo message="Creating jdbc resource pool ${jdbc.resource.name}"
+<echo message="Creating jdbc resource pool ${jdbc.resource.name}"
level="verbose"/>
<echo message="asadmin create-jdbc-resource ${as.props} --connectionpoolid ${jdbc.conpool.name} --target ${appserver.instance.name} ${jdbc.resource.name}"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -898,7 +898,7 @@
<!-- Target to create persistence resource -->
<!-- ================================================================ -->
<target name="create-persistence-resource-common" depends="init-common">
-<echo message="Creating pm resource at ${pm.resource.name}"
+<echo message="Creating pm resource at ${pm.resource.name}"
level="verbose"/>
<echo message="asadmin create-persistence-resource ${as.props} --target ${appserver.instance.name} ${pm.resource.name}"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -908,7 +908,7 @@
<arg line="--target ${appserver.instance.name}"/>
<arg line="${pm.resource.name}"/>
</exec>
- <echo message="Created ${pm.resource.name} --target ${appserver.instance.name}"/>
+ <echo message="Created ${pm.resource.name} --target ${appserver.instance.name}"/>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
<param name="operand.props"
@@ -927,14 +927,14 @@
<target name="delete-persistence-resource-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="delete-persistence-resource
+ value="delete-persistence-resource
--target ${appserver.instance.name}" />
<param name="operand.props" value="${pm.resource.name}" />
</antcall>
</target>
<target name="execute-sql-common" depends="init-common">
-<echo message="Executing sql statement at ${basedir} from ${sql.file}"
+<echo message="Executing sql statement at ${basedir} from ${sql.file}"
level="verbose"/>
<sql
driver="${db.driver}"
@@ -949,7 +949,7 @@
<target name="execute-ejb-sql-common" depends="init-common">
-<echo message="Executing sql statement at ${basedir} from ${sql.file}"
+<echo message="Executing sql statement at ${basedir} from ${sql.file}"
level="verbose"/>
<sql
driver="${db.driver}"
@@ -965,8 +965,8 @@
<!-- ================================================================ -->
<!-- Target to create/delete javamail resources -->
-<!--
- Properties required:
+<!--
+ Properties required:
mailhost
fromaddress
debug
@@ -1007,7 +1007,7 @@
<!-- Target to create database table through SQL file -->
<!-- ================================================================ -->
<target name="create-sql-common" depends="init-common">
-<echo message="creating tables from ${basedir}/sql/${db.create}"
+<echo message="creating tables from ${basedir}/sql/${db.create}"
level="verbose"/>
<sql
driver="${db.driver}"
@@ -1026,7 +1026,7 @@
<!-- Target to delete database table through SQL file -->
<!-- ================================================================ -->
<target name="delete-sql-common" depends="init-common">
-<echo message="dropping tables from ${basedir}/sql/${db.drop}"
+<echo message="dropping tables from ${basedir}/sql/${db.drop}"
level="verbose"/>
<sql
driver="${db.driver}"
@@ -1045,11 +1045,11 @@
<!-- Taget to create JMS Connection -->
<!-- ======================================================= -->
<target name="create-jms-connection-common" depends="init-common">
- <echo message="Creating JMS connection factory with name ${jms.factory.name}"
+ <echo message="Creating JMS connection factory with name ${jms.factory.name}"
level="verbose"/>
<exec executable="${ASADMIN}">
<arg line="create-jms-resource "/>
- <arg line="--restype ${jms.factory.type}"/>
+ <arg line="--restype ${jms.factory.type}"/>
<arg line="${as.props}"/>
<arg line="--target ${appserver.instance.name}"/>
<arg line="${jms.factory.name}" />
@@ -1060,23 +1060,23 @@
<!-- Taget to delete JMS Connection -->
<!-- ======================================================= -->
<target name="delete-jms-connection-common" depends="init-common">
- <echo message="Delete JMS connection factory with name ${jms.factory.name}"
+ <echo message="Delete JMS connection factory with name ${jms.factory.name}"
level="verbose"/>
<exec executable="${ASADMIN}">
- <arg line="delete-jms-resource "/>
+ <arg line="delete-jms-resource "/>
<arg line="${as.props}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${jms.factory.name}"/>
</exec>
</target>
<!-- JMS: create/delete Destination Resource Targets -->
<target name="create-jms-resource-common" depends="init-common">
- <echo message="Creating JMS resource with name ${jms.resource.name}"
+ <echo message="Creating JMS resource with name ${jms.resource.name}"
level="verbose"/>
<exec executable="${ASADMIN}">
- <arg line="create-jmsdest --desttype ${dest.type} "/>
+ <arg line="create-jmsdest --desttype ${dest.type} "/>
<arg line="${as.props}"/>
<arg line="${dest.name}"/>
</exec>
@@ -1085,24 +1085,24 @@
<arg line="create-jms-resource "/>
<arg line="--restype ${jms.resource.type}"/>
<arg line="--property imqDestinationName=${dest.name}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${as.props}"/>
<arg line="${jms.resource.name}"/>
</exec>
</target>
<target name="delete-jms-resource-common" depends="init-common">
- <echo message="Delete JMS resource with name ${jms.resource.name}"
+ <echo message="Delete JMS resource with name ${jms.resource.name}"
level="verbose"/>
<exec executable="${ASADMIN}">
<arg line="delete-jms-resource "/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${as.props} ${jms.resource.name}"/>
</exec>
<exec executable="${ASADMIN}">
- <arg line="delete-jmsdest --desttype ${dest.type} "/>
+ <arg line="delete-jmsdest --desttype ${dest.type} "/>
<arg line="${as.props} ${dest.name}"/>
</exec>
</target>
@@ -1146,20 +1146,20 @@
<target name="deploy-common" depends="init-common">
<antcall target="deploy-common-pe"/>
<antcall target="deploy-common-ee"/>
-</target>
+</target>
<target name="deploy-verify-common" depends="init-common">
<antcall target="deploy-verify-common-pe"/>
<antcall target="deploy-verify-common-ee"/>
-</target>
+</target>
<target name="deploy-common-pe" depends="init-common" unless="ee">
<property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
<property name="extra-params" value=""/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
- <arg line="${as.props}"/>
- <arg line="${extra-params}"/>
+ <arg line="${as.props}"/>
+ <arg line="${extra-params}"/>
<arg line="--target ${appserver.instance.name}"/>
<arg line="--retrieve ${assemble.dir}"/>
<arg line="--libraries ${libraries}"/>
@@ -1169,7 +1169,7 @@
<echo message="Deployment on target server ${appserver.instance.name} successful"/>
</target>
-<target name="deploy-common-ee" depends="init-common" if="ee">
+<target name="deploy-common-ee" depends="init-common" if="ee">
<echo message="Deploying in EE..."/>
<property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -1221,9 +1221,9 @@
<arg line="--precompilejsp=${precompilejsp}"/>
<arg line="--upload true"/>
<arg line="--retrieve ${assemble.dir}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
</exec>
-</target>
+</target>
<target name="deploy-war-name" depends="init-common">
<echo message="Deploying ${warname} from ${basedir}."
@@ -1253,7 +1253,7 @@
</target>
<target name="deploy-wab-commonpe" depends="init-common" unless="ee">
- <echo message="Deploying WAB ${assemble.dir}/${appname}-web.war from ${basedir}."
+ <echo message="Deploying WAB ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
<property name="precompilejsp" value="true"/>
<property name="force" value="false"/>
@@ -1263,17 +1263,17 @@
<arg line="--precompilejsp=${precompilejsp}"/>
<arg line="--force=${force}"/>
<arg line="--upload=true"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="--libraries ${libraries}"/>
<arg line="--type=osgi"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
-</target>
+</target>
<target name="deploy-war-commonpe" depends="init-common" unless="ee">
- <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
+ <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
<property name="precompilejsp" value="true"/>
<property name="force" value="false"/>
@@ -1284,11 +1284,11 @@
<arg line="--precompilejsp=${precompilejsp}"/>
<arg line="--force=${force}"/>
<arg line="--upload=true"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="--libraries ${libraries}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
-</target>
+</target>
<target name="deploy-war-commonee" if="ee">
<property name="precompilejsp" value="true"/>
@@ -1301,7 +1301,7 @@
<arg line="--precompilejsp=${precompilejsp}"/>
<arg line="--force=${force}"/>
<arg line="--upload=true"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="--libraries ${libraries}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
@@ -1351,10 +1351,10 @@
<arg line="deploy"/>
<arg line="${as.props}"/>
<arg line="--upload=true"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-ejb.jar"/>
</exec>
-</target>
+</target>
<!-- deploy the standalone jar in AppServ -->
<target name="deploy-client-common" depends="init-common">
@@ -1362,11 +1362,11 @@
<arg line="deploy"/>
<arg line="${as.props}"/>
<arg line="--upload=true"/>
- <arg line="--retrieve ${assemble.dir}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--retrieve ${assemble.dir}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-client.jar"/>
</exec>
-</target>
+</target>
<target name="undeploy-war-name" depends="init-common">
<property name="deployedapp.name" value="${warname}"/>
@@ -1388,27 +1388,27 @@
<exec executable="${ASADMIN}" failonerror="false">
<arg line="undeploy"/>
<arg line="${as.props}"/>
-<!--
-<arg line=type ${apptype}/>
+<!--
+<arg line=type ${apptype}/>
-->
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${extra-params}"/>
<!-- deployedapp.name defaults to {appname}App.declared in properties.xml-->
- <arg line="${deployedapp.name}"/>
+ <arg line="${deployedapp.name}"/>
</exec>
</target>
<!-- undeploy the standalone war in AppServ -->
<target name="undeploy-war-common" depends="init-common">
- <echo message="Undeploying warfile ${appname}-web from
+ <echo message="Undeploying warfile ${appname}-web from
${assemble.dir}/${appname}-web.war from ${basedir}." level="verbose"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="undeploy"/>
<arg line="${as.props}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${appname}-web"/>
</exec>
-</target>
+</target>
<!-- undeploy the standalone war in AppServ -->
@@ -1416,7 +1416,7 @@
<exec executable="${ASADMIN}" failonerror="false">
<arg line="undeploy"/>
<arg line="${as.props}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${appname}-ejb"/>
</exec>
</target>
@@ -1426,10 +1426,10 @@
<exec executable="${ASADMIN}" failonerror="false">
<arg line="undeploy"/>
<arg line="${as.props}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${appname}-client"/>
</exec>
-</target>
+</target>
<!-- run appclient in AppServ -->
@@ -1472,11 +1472,11 @@
<arg value="${testsuite.id}"/>
</java>
</target>
-
+
<!-- prepare Pointbase servers -->
<target name="preparePB" depends="init-common">
<echo message="Starting Pointbase servers" level="verbose"/>
- <copy file="${env.APS_HOME}/lib/pointbase.ini"
+ <copy file="${env.APS_HOME}/lib/pointbase.ini"
tofile="${db.dir}/pointbase.ini"/>
<replace file="${db.dir}/pointbase.ini" token="@@@" value="${db.dir}"/>
</target>
@@ -1499,12 +1499,12 @@
<!-- target name="startPB" depends="preparePB">
<parallel>
- <java classname="com.pointbase.net.netServer"
+ <java classname="com.pointbase.net.netServer"
classpath="${db.classpath}" failonerror="false" fork="true">
<arg line="/port:9092"/>
<arg line="/pointbase.ini=${db.dir}/pointbase.ini"/>
</java>
- <java classname="com.pointbase.net.netServer"
+ <java classname="com.pointbase.net.netServer"
classpath="${db.classpath}" failonerror="true" fork="true">
<arg line="/port:9093"/>
<arg line="/pointbase.ini=${db.dir}/pointbase.ini"/>
@@ -1515,7 +1515,7 @@
<!-- start Derby Database -->
<target name="startDerby">
<condition property="darwin">
- <os name="Mac OS X"/>
+ <os name="Mac OS X"/>
</condition>
<antcall target="startDerbyNonMac"/>
<antcall target="startDerbyMac"/>
@@ -1532,7 +1532,7 @@
classpath="${db.classpath}" fork="true" spawn="true">
<arg line="-h localhost -p 1528 start"/>
</java>
- </parallel>
+ </parallel>
</target>
<target name="startDerbyMac" depends="init-common" if="darwin">
@@ -1545,7 +1545,7 @@
</java>
<java classname="org.apache.derby.drda.NetworkServerControl"
classpath="${db.classpath}" fork="true" spawn="true">
- <sysproperty key="derby.storage.fileSyncTransactionLog" value="true"/>
+ <sysproperty key="derby.storage.fileSyncTransactionLog" value="true"/>
<arg line="-h localhost -p 1528 start"/>
</java>
</parallel>
@@ -1573,10 +1573,10 @@
<!-- setup IMQ for RI Build -->
<target name="setup-mq-common" depends="init-common">
- <echo message="Executing Datastore setup for S1MQ. Required only for RI"
+ <echo message="Executing Datastore setup for S1MQ. Required only for RI"
level="verbose"/>
- <echo message="${IMQDBMGR} -javahome ${java.home}
- -b ${admin.domain}_${appserver.instance.name} create all"
+ <echo message="${IMQDBMGR} -javahome ${java.home}
+ -b ${admin.domain}_${appserver.instance.name} create all"
level="verbose"/>
<exec executable="${IMQDBMGR}" failonerror="true">
<arg line="-javahome ${java.home} -b ${admin.domain}_${appserver.instance.name} create all" />
@@ -1637,13 +1637,13 @@
<!-- usage -->
<target name="usage-common">
- <echo>
+ <echo>
ant clean Remove all classes files
ant build Build the application
ant deploy Deploy the ear files to S1AS
- ant run Run the application
+ ant run Run the application
ant undeploy Undeploy the ear files from S1AS
- ant usage Display this message
+ ant usage Display this message
</echo>
</target>
@@ -1669,13 +1669,13 @@
<target name="restart-instance">
<echo message="Restarting remote server instance,until this gets fixed"/>
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="false">
<arg line="stop-instance"/>
<arg line="${as.props}"/>
<arg line="${appserver.instance.name}"/>
</exec>
<sleep seconds="30"/>
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="false">
<arg line="start-instance"/>
<arg line="${as.props}"/>
<arg line="${appserver.instance.name}"/>
@@ -1698,7 +1698,7 @@
</target>
<target name="setupTimer" depends="init-common" if="ee">
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="false">
<arg line="create-resource-ref"/>
<arg line="${as.props}"/>
<arg line="--target server"/>
@@ -1725,13 +1725,13 @@
</target>
<target name="unsetupTimer" depends="init-common" if="ee">
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="false">
<arg line="delete-resource-ref"/>
<arg line="${as.props}"/>
<arg line="--target server"/>
<arg line="${jdbc.resource.name}"/>
</exec>
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="false">
<arg line="unset"/>
<arg line="${appserver.instance.name}-config.ejb-container.ejb-timer-service.timer-datasource"/>
</exec>
@@ -1924,7 +1924,7 @@
<!-- Target to Flush connection pool -->
<!-- ================================================================ -->
<target name="flush-connpool-common" depends="init-common">
-<echo message="Flush connection pool ${jdbc.conpool.name}"
+<echo message="Flush connection pool ${jdbc.conpool.name}"
level="verbose"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="flush-connection-pool"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/build.properties b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/build.properties
index 38d97bd..0f8adf8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-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}-wab"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/build.xml b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/build.xml
index c410fd0..187ecf0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/build.xml
@@ -42,7 +42,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -50,26 +50,26 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-wab-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-wab-common"/>
<echo message="sleeping for 10 seconds to allow the WAB deployment"/>
<sleep seconds="10"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -81,10 +81,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/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestBean.java
index fad6896..9bcc84e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestBean.java
@@ -16,7 +16,7 @@
package tests.cdi;
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
//This bean implements Serializable as it needs to be placed into a Stateful Bean
public class TestBean
{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
index 177f830..6d5527d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
@@ -51,7 +51,7 @@
msg += "BeanManager Injection via component environment lookup failed";
}
if (bm1 == null) msg += "BeanManager Injection via component environment lookup failed";
-
+
System.out.println("BeanManager is " + bm);
System.out.println("BeanManager via lookup is " + bm1);
writer.write(msg + "\n");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/pom.xml b/appserver/tests/appserv-tests/devtests/cdi/pom.xml
index 76e9798..9f191e8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.glassfish.main.tests</groupId>
<artifactId>tests</artifactId>
<packaging>pom</packaging>
- <name>GlassFish devtests cdi</name>
+ <name>GlassFish devtests cdi</name>
<modules>
<!-- module>quicklook</module -->
</modules>
@@ -44,19 +44,19 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
<version>1.8.0</version>
- <scope>system</scope>
- <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
- </dependency>
+ <scope>system</scope>
+ <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
+ </dependency>
</dependencies>
<executions>
<execution>
<id>id.test.1</id>
<phase>test</phase>
- <configuration>
+ <configuration>
<target name="mvnUsage" unless="testMods">
<ant antfile="build.xml" target="mvnUsage"/>
</target>
@@ -68,7 +68,7 @@
<execution>
<id>id.test.2</id>
<phase>test</phase>
- <configuration>
+ <configuration>
<target name="antTests" if="testMods">
<ant antfile="build.xml" target="antTests"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/build.properties b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/build.properties
index f6975d1..81a0564 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/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}-bean-interface"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/build.xml b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/build.xml
index 8894688..2556532 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,24 +48,24 @@
</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="cdi-extension.service" value="cdi-extension.service"/>
+ <param name="cdi-extension.service" value="cdi-extension.service"/>
</antcall>
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -77,10 +77,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/portable-extensions/bean-interface/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/client/test/client/WebTest.java
index 6eb31e4..bcf8aef 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/client/test/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for portable extensions");
WebTest webTest = new WebTest(args);
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -59,7 +59,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -98,10 +98,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/portable-extensions/bean-interface/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TransactionInterceptor.java
index c8cd767..60598e5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TransactionInterceptor.java
@@ -29,23 +29,23 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@Inject
TransactionInterceptor(MyExtension myex){ //Injection of portable extension in a bean
if(myex == null) {
errorMessage += "Portable Extension Injection in Interceptor failed";
}
}
-
-
+
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage += "Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/Transactional.java
index 98f85d4..8bd98cb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/Transactional.java
@@ -31,5 +31,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/extension/MyExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/extension/MyExtension.java
index 67737a9..faf39b1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/extension/MyExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/extension/MyExtension.java
@@ -29,12 +29,12 @@
public static boolean beforeBeanDiscoveryCalled = false;
public static boolean afterBeanDiscoveryCalled = false;
public static boolean processAnnotatedTypeCalled = false;
-
+
void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bdd){
System.out.println("MyExtension::beforeBeanDiscovery" + bdd);
beforeBeanDiscoveryCalled = true;
}
-
+
<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat){
System.out.println("MyExtension:Process annotated type" + pat.getAnnotatedType().getBaseType());
processAnnotatedTypeCalled = true;
@@ -45,10 +45,10 @@
pat.veto();
}
}
-
+
void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager bm){
System.out.println("MyExtension: abd: " + abd + " BeanManager: " + bm);
-
+
if (bm != null) {
//ensure a valid BeanManager is injected
afterBeanDiscoveryCalled = true;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/build.properties b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/build.properties
index ff05db0..0a9633d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/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}-bean-manager"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/build.xml b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/build.xml
index 8894688..2556532 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,24 +48,24 @@
</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="cdi-extension.service" value="cdi-extension.service"/>
+ <param name="cdi-extension.service" value="cdi-extension.service"/>
</antcall>
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -77,10 +77,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/portable-extensions/bean-manager/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/client/test/client/WebTest.java
index 83cd4ab..97ad198 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/client/test/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for portable extensions");
WebTest webTest = new WebTest(args);
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -59,7 +59,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -98,10 +98,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/portable-extensions/bean-manager/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TransactionInterceptor.java
index c8cd767..60598e5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TransactionInterceptor.java
@@ -29,23 +29,23 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@Inject
TransactionInterceptor(MyExtension myex){ //Injection of portable extension in a bean
if(myex == null) {
errorMessage += "Portable Extension Injection in Interceptor failed";
}
}
-
-
+
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage += "Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/Transactional.java
index 98f85d4..8bd98cb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/Transactional.java
@@ -31,5 +31,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/extension/MyExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/extension/MyExtension.java
index 67737a9..faf39b1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/extension/MyExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/extension/MyExtension.java
@@ -29,12 +29,12 @@
public static boolean beforeBeanDiscoveryCalled = false;
public static boolean afterBeanDiscoveryCalled = false;
public static boolean processAnnotatedTypeCalled = false;
-
+
void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bdd){
System.out.println("MyExtension::beforeBeanDiscovery" + bdd);
beforeBeanDiscoveryCalled = true;
}
-
+
<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat){
System.out.println("MyExtension:Process annotated type" + pat.getAnnotatedType().getBaseType());
processAnnotatedTypeCalled = true;
@@ -45,10 +45,10 @@
pat.veto();
}
}
-
+
void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager bm){
System.out.println("MyExtension: abd: " + abd + " BeanManager: " + bm);
-
+
if (bm != null) {
//ensure a valid BeanManager is injected
afterBeanDiscoveryCalled = true;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/servlet/PortableExtensionBeanManagerTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/servlet/PortableExtensionBeanManagerTestServlet.java
index 5861ffb..08c5bbe 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/servlet/PortableExtensionBeanManagerTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/servlet/PortableExtensionBeanManagerTestServlet.java
@@ -46,10 +46,10 @@
@Inject
@Preferred
TestBean tb;
-
+
@Inject
BeanManager bm;
-
+
String msg = "";
@@ -73,34 +73,34 @@
+ TransactionInterceptor.aroundInvokeInvocationCount;
if (!TransactionInterceptor.errorMessage.trim().equals(""))
msg += TransactionInterceptor.errorMessage;
-
+
//check if our portable extension was called
if (!MyExtension.beforeBeanDiscoveryCalled)
msg += "Portable Extension lifecycle observer method: " +
- "beforeBeanDiscovery not called";
+ "beforeBeanDiscovery not called";
if (!MyExtension.afterBeanDiscoveryCalled)
msg += "Portable Extension lifecycle observer method: " +
- "afterBeanDiscovery not called or injection of BeanManager " +
- "in an observer method failed";
-
+ "afterBeanDiscovery not called or injection of BeanManager " +
+ "in an observer method failed";
+
if (!MyExtension.processAnnotatedTypeCalled)
msg += "Portable Extension lifecycle observer method: process " +
- "annotated type not called";
+ "annotated type not called";
//BeanManager lookup
if (bm == null)
msg += "Injection of BeanManager into servlet failed";
-
+
try {
BeanManager bm1 = (BeanManager) (new InitialContext()).lookup("java:comp/BeanManager");
- if (bm1 == null)
+ if (bm1 == null)
msg += "lookup of BeanManager via component context failed";
} catch (NamingException e) {
e.printStackTrace();
msg += "NamingException during lookup of BeanManager via component context";
}
-
+
//Using BeanManager
check((bm.getBeans("test_named_bean").size() == 1), "Invalid number of Named Beans");
check((bm.getBeans("duplicate_test_bean").size() == 0), "Invalid number of Duplicate Test Beans");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/build.xml b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/build.xml
index 78368ab..a34b5af 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/build.xml
@@ -88,15 +88,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the portable-extensions tests)
- ant clean (cleans all the portable-extensions tests)
- ant build (builds all the portable-extensions tests)
- ant setup (sets up all resources for portable-extensions tests)
- ant deploy (deploys all the portable-extensions apps)
- ant run (Executes all the portable-extensions tests)
- ant undeploy (undeploys all the portable-extensions apps)
- ant unsetup (unsets all resources for portable-extensions tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the portable-extensions tests)
+ ant clean (cleans all the portable-extensions tests)
+ ant build (builds all the portable-extensions tests)
+ ant setup (sets up all resources for portable-extensions tests)
+ ant deploy (deploys all the portable-extensions apps)
+ ant run (Executes all the portable-extensions tests)
+ ant undeploy (undeploys all the portable-extensions apps)
+ ant unsetup (unsets all resources for portable-extensions tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/build.properties b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/build.properties
index 74b15e1..66ab33d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/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}-injection-target"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/build.xml b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/build.xml
index 8894688..2556532 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,24 +48,24 @@
</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="cdi-extension.service" value="cdi-extension.service"/>
+ <param name="cdi-extension.service" value="cdi-extension.service"/>
</antcall>
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -77,10 +77,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/portable-extensions/injection-target/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/client/test/client/WebTest.java
index 9b01e09..3cd8e92 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/client/test/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for portable extensions");
WebTest webTest = new WebTest(args);
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -59,7 +59,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -98,10 +98,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/portable-extensions/injection-target/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TransactionInterceptor.java
index c8cd767..60598e5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TransactionInterceptor.java
@@ -29,23 +29,23 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@Inject
TransactionInterceptor(MyExtension myex){ //Injection of portable extension in a bean
if(myex == null) {
errorMessage += "Portable Extension Injection in Interceptor failed";
}
}
-
-
+
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage += "Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/Transactional.java
index 98f85d4..8bd98cb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/Transactional.java
@@ -31,5 +31,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/extension/MyExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/extension/MyExtension.java
index 67737a9..faf39b1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/extension/MyExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/extension/MyExtension.java
@@ -29,12 +29,12 @@
public static boolean beforeBeanDiscoveryCalled = false;
public static boolean afterBeanDiscoveryCalled = false;
public static boolean processAnnotatedTypeCalled = false;
-
+
void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bdd){
System.out.println("MyExtension::beforeBeanDiscovery" + bdd);
beforeBeanDiscoveryCalled = true;
}
-
+
<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat){
System.out.println("MyExtension:Process annotated type" + pat.getAnnotatedType().getBaseType());
processAnnotatedTypeCalled = true;
@@ -45,10 +45,10 @@
pat.veto();
}
}
-
+
void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager bm){
System.out.println("MyExtension: abd: " + abd + " BeanManager: " + bm);
-
+
if (bm != null) {
//ensure a valid BeanManager is injected
afterBeanDiscoveryCalled = true;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithConstructorInjection.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithConstructorInjection.java
index 668db04..231b437 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithConstructorInjection.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithConstructorInjection.java
@@ -38,7 +38,7 @@
@Inject
public TestFrameworkClassWithConstructorInjection(@Preferred TestBean tb) {
System.out.println("constructor based injection " +
- "into a framework class" + tb);
+ "into a framework class" + tb);
this.tb = tb;
if (tb == null) {
msg += "Constructor injection in a test framework class failed";
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithSetterAndFieldInjection.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithSetterAndFieldInjection.java
index 6e81e0e..5c66612 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithSetterAndFieldInjection.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithSetterAndFieldInjection.java
@@ -25,11 +25,11 @@
public class TestFrameworkClassWithSetterAndFieldInjection {
-
+
@Inject TestNamedBean tnb;
private TestBean tb;
-
+
private String msg = "";
private boolean postConstructCalled = false;
@@ -42,8 +42,8 @@
public TestFrameworkClassWithSetterAndFieldInjection(String magicKey){
if(!magicKey.equals("test")) throw new RuntimeException();
}
-
-
+
+
@Inject
public void setTestBean(@Preferred TestBean tb){
System.out.println("Setter based injection " +
@@ -52,9 +52,9 @@
if (tb == null) {
msg += "Constructor injection in a test framework class failed";
}
-
+
}
-
+
@PostConstruct
private void beanPostConstruct() {
this.postConstructCalled = true;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
index 05c481c..06cd1a0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
@@ -45,7 +45,7 @@
@WebServlet(name = "mytest", urlPatterns = { "/myurl" })
public class PortableExtensionInjectionTargetTestServlet extends HttpServlet {
-
+
@Inject
@Preferred
TestBean tb;
@@ -65,7 +65,7 @@
tb.m1();
if (!TransactionInterceptor.aroundInvokeCalled)
msg += "Business method interceptor aroundInvoke not called";
-
+
tb.m2();
if (TransactionInterceptor.aroundInvokeInvocationCount != 2)
msg += "Business method interceptor invocation on method-level " + "interceptor annotation count not expected. " + "expected =2, actual="
@@ -89,12 +89,12 @@
msg += "Injection of BeanManager into servlet failed";
AnnotatedType<TestFrameworkClassWithConstructorInjection> atfc = bm.createAnnotatedType(TestFrameworkClassWithConstructorInjection.class);
-
+
// First: Constructor Injection Framework class
CreationalContext ctx = bm.createCreationalContext(null);
InjectionTarget<TestFrameworkClassWithConstructorInjection> it = bm.createInjectionTarget(atfc);
TestFrameworkClassWithConstructorInjection ctorInstance = it.produce(ctx);
-
+
// Since this framework class needs to support constructor based injection
// we need to ask the CDI runtime to produce the instance.
it.inject(ctorInstance, ctx);
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/build.properties b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/build.properties
index a3a1b42..0f1f302 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-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}-make-framework-bean-available-for-injection-extension-in-lib"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/build.xml b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/build.xml
index eba1687..7b8132b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/build.xml
@@ -41,7 +41,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<!-- compile and build extension jar -->
<antcall target="compile-common">
@@ -55,7 +55,7 @@
tofile="${build.classes.dir}/META-INF/services/jakarta.enterprise.inject.spi.Extension"
failonerror="false"/>
<copy file="${beans.xml}"
- tofile="${build.classes.dir}/META-INF/beans.xml"
+ tofile="${build.classes.dir}/META-INF/beans.xml"
failonerror="false"/>
<jar jarfile="lib/${extension.jar}" basedir="${build.classes.dir}" update="true" includes ="${build.classes.dir}">
<metainf dir="${build.classes.dir}/META-INF">
@@ -76,7 +76,7 @@
</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"/>
@@ -85,14 +85,14 @@
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -104,10 +104,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/portable-extensions/new-bean-registration-extension-in-lib/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/client/test/client/WebTest.java
index 384c383..99e06bc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/client/test/client/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for portable extensions");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -64,7 +64,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -103,10 +103,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/portable-extensions/new-bean-registration-extension-in-lib/extension/test/extension/FrameworkServiceFactory.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/extension/FrameworkServiceFactory.java
index 44e2f7f..1d84a75 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/extension/FrameworkServiceFactory.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/extension/FrameworkServiceFactory.java
@@ -25,11 +25,11 @@
/**
- * A simple Service Factory class that provides the ability to obtain/get
- * references to a service implementation (obtained from a service registry)
+ * A simple Service Factory class that provides the ability to obtain/get
+ * references to a service implementation (obtained from a service registry)
* and also provides a mechanism to unget or return a service after its usage
* is completed.
- *
+ *
* @author Sivakumar Thyagarajan
*/
public class FrameworkServiceFactory {
@@ -41,11 +41,11 @@
public static Object getService(final Type type, final FrameworkService fs){
debug("getService " + type + " FS:" + fs);
Object instance = lookupService(type, fs.waitTimeout());
-
- //If the service is marked as dynamic, when a method is invoked on a
- //a service proxy, an attempt is made to get a reference to the service
+
+ //If the service is marked as dynamic, when a method is invoked on a
+ //a service proxy, an attempt is made to get a reference to the service
//and then the method is invoked on the newly obtained service.
- //This scheme should work for statless and/or idempotent service
+ //This scheme should work for statless and/or idempotent service
//implementations that have a dynamic lifecycle that is not linked to
//the service consumer [service dynamism]
if (fs.dynamic()) {
@@ -59,14 +59,14 @@
}
};
instance = Proxy.newProxyInstance(
- Thread.currentThread().getContextClassLoader(),
- new Class[]{(Class)type},
- proxyInvHndlr);
+ Thread.currentThread().getContextClassLoader(),
+ new Class[]{(Class)type},
+ proxyInvHndlr);
}
return instance;
}
- //NOTE:hard-coded service instantiation for this test,
+ //NOTE:hard-coded service instantiation for this test,
//but ideally should get the
//service implementation from the framework's service registry
private static Object lookupService(Type type, int waitTimeout) {
@@ -90,15 +90,15 @@
/**
* Unget the service
*/
- public static void ungetService(Object serviceInstance,
+ public static void ungetService(Object serviceInstance,
Type type, FrameworkService frameworkService){
//unget the service instance from the service registry
}
-
+
private static void debug(String string) {
if(DEBUG_ENABLED)
System.out.println("ServiceFactory:: " + string);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/extension/ServiceFrameworkExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/extension/ServiceFrameworkExtension.java
index e006da3..3125ed4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/extension/ServiceFrameworkExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/extension/ServiceFrameworkExtension.java
@@ -46,8 +46,8 @@
/**
* A portable extension that supports injection of custom framework
- * services into Beans.
- *
+ * services into Beans.
+ *
* @author Sivakumar Thyagarajan
*/
public class ServiceFrameworkExtension implements Extension{
@@ -56,7 +56,7 @@
public static boolean afterBeanDiscoveryCalled = false;
public static boolean afterProcessBeanCalled = false;
public static boolean processAnnotatedTypeCalled = false;
-
+
/*
* A map of Framework Service Types to be injected and additional metadata
* about the FrameworkService to be injected.
@@ -76,27 +76,27 @@
debug("Process annotated type" + pat.getAnnotatedType().getBaseType());
processAnnotatedTypeCalled = true;
}
-
+
/**
* Observer for <code>ProcessInjectionTarget</code> events. This event is
- * fired for every Java EE component class supporting injection that may be
- * instantiated by the container at runtime. Injections points of every
- * discovered enabled Java EE component is checked to see if there is a
- * request for injection of a framework service.
+ * fired for every Java EE component class supporting injection that may be
+ * instantiated by the container at runtime. Injections points of every
+ * discovered enabled Java EE component is checked to see if there is a
+ * request for injection of a framework service.
*/
void afterProcessInjectionTarget(@Observes ProcessInjectionTarget<?> pb){
debug("AfterProcessInjectionTarget" + pb.getAnnotatedType().getBaseType());
Set<InjectionPoint> ips = pb.getInjectionTarget().getInjectionPoints();
discoverServiceInjectionPoints(ips);
}
-
+
/**
* Observer for <code>ProcessInjectionTarget</code> events. This event is
- * fired fire an event for each enabled bean, interceptor or decorator
- * deployed in a bean archive, before registering the Bean object.
- * Injections points of every discovered enabled Java EE component is
- * checked to see if there is a request for injection of a framework
- * service.
+ * fired fire an event for each enabled bean, interceptor or decorator
+ * deployed in a bean archive, before registering the Bean object.
+ * Injections points of every discovered enabled Java EE component is
+ * checked to see if there is a request for injection of a framework
+ * service.
*/
void afterProcessBean(@Observes ProcessBean pb){
afterProcessBeanCalled = true;
@@ -107,22 +107,22 @@
/*
* Discover injection points where the framework service is requested
- * through the <code>FrameworkService</code> qualifier and a map is
+ * through the <code>FrameworkService</code> qualifier and a map is
* populated for all framework services that have been requested.
*/
private void discoverServiceInjectionPoints(Set<InjectionPoint> ips) {
- for (Iterator<InjectionPoint> iterator = ips.iterator();
+ for (Iterator<InjectionPoint> iterator = ips.iterator();
iterator.hasNext();) {
InjectionPoint injectionPoint = iterator.next();
Set<Annotation> qualifs = injectionPoint.getQualifiers();
- for (Iterator<Annotation> qualifIter = qualifs.iterator();
+ for (Iterator<Annotation> qualifIter = qualifs.iterator();
qualifIter.hasNext();) {
Annotation annotation = qualifIter.next();
if (annotation.annotationType().equals(FrameworkService.class)){
printDebugForInjectionPoint(injectionPoint);
//Keep track of service-type and its attributes
System.out.println("---- Injection requested for " +
- "framework service type " + injectionPoint.getType()
+ "framework service type " + injectionPoint.getType()
+ " and annotated with dynamic="
+ injectionPoint.getAnnotated()
.getAnnotation(FrameworkService.class)
@@ -134,31 +134,31 @@
//Add to list of framework services to be injected
Type key = injectionPoint.getType();
FrameworkService value = injectionPoint.getAnnotated()
- .getAnnotation(FrameworkService.class);
+ .getAnnotation(FrameworkService.class);
if (!frameworkServicesToBeInjected.containsKey(key)){
frameworkServicesToBeInjected.put(key, new HashSet<FrameworkService>());
}
frameworkServicesToBeInjected.get(key).add(value);
System.out.println(frameworkServicesToBeInjected.get(key).size());
-
+
}
}
}
}
/**
- * Observer for <code>AfterBeanDiscovery</code> events. This
+ * Observer for <code>AfterBeanDiscovery</code> events. This
* observer method is used to register <code>Bean</code>s for the framework
- * services that have been requested to be injected.
+ * services that have been requested to be injected.
*/
void afterBeanDiscovery(@Observes AfterBeanDiscovery abd){
afterBeanDiscoveryCalled = true;
debug("After Bean Discovery");
- for (Iterator<Type> iterator = this.frameworkServicesToBeInjected.keySet().iterator();
+ for (Iterator<Type> iterator = this.frameworkServicesToBeInjected.keySet().iterator();
iterator.hasNext();) {
Type type = iterator.next();
//If the injection point's type is not a Class or Interface, we
- //don't know how to handle this.
+ //don't know how to handle this.
if (!(type instanceof Class)) {
System.out.println("Unknown type:" + type);
abd.addDefinitionError(new UnsupportedOperationException(
@@ -173,10 +173,10 @@
/*
* Add a <code>Bean</code> for the framework service requested. Instantiate
- * or discover the bean from the framework service registry,
+ * or discover the bean from the framework service registry,
* and return a reference to the service if a dynamic reference is requested.
*/
- private void addBean(AfterBeanDiscovery abd, final Type type,
+ private void addBean(AfterBeanDiscovery abd, final Type type,
final Set<FrameworkService> frameworkServices) {
for (Iterator<FrameworkService> iterator = frameworkServices.iterator(); iterator
.hasNext();) {
@@ -185,7 +185,7 @@
abd.addBean(new FrameworkServiceBean(type, frameworkService));
}
}
-
+
private final class FrameworkServiceBean implements Bean {
private final Type type;
@@ -224,7 +224,7 @@
@Override
public String getName() {
return type + "_dynamic_" + frameworkService.dynamic()
- + "_criteria_" + frameworkService.serviceCriteria()
+ + "_criteria_" + frameworkService.serviceCriteria()
+ "_waitTimeout" + frameworkService.waitTimeout();
}
@@ -235,7 +235,7 @@
s.add(new AnnotationLiteral<Any>() {});
//Add the appropriate parameters to the FrameworkService qualifier
//as requested in the injection point
- s.add(new FrameworkServiceQualifierType(frameworkService));
+ s.add(new FrameworkServiceQualifierType(frameworkService));
return s;
}
@@ -272,7 +272,7 @@
* Represents an annotation type instance of FrameworkService
* with parameters equal to those specified in the injection point
*/
- private final class FrameworkServiceQualifierType
+ private final class FrameworkServiceQualifierType
extends AnnotationLiteral<FrameworkService> implements FrameworkService {
private String serviceCriteria = "";
private boolean dynamic = false;
@@ -298,11 +298,11 @@
return this.waitTimeout;
}
}
-
+
private void debug(String string) {
if(DEBUG_ENABLED)
System.out.println("MyExtension:: " + string);
-
+
}
private void printDebugForInjectionPoint(InjectionPoint injectionPoint) {
@@ -319,5 +319,5 @@
// point
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/fwk/FrameworkService.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/fwk/FrameworkService.java
index 68ef46d..cfa70ff 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/fwk/FrameworkService.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/fwk/FrameworkService.java
@@ -33,26 +33,26 @@
/**
* A CDI Qualifier that represents a reference to a
- * service in the framework. If this qualifiers annotates an injection point,
+ * service in the framework. If this qualifiers annotates an injection point,
* the framework extension discovers and instantiates
* a service implementing the service interface type of the injection point
* and makes it available for injection to that injection point.
- */
+ */
public @interface FrameworkService {
/**
* Determines if the service reference that is injected
* refers to a dynamic proxy or the actual service reference obtained
- * from the framework service registry
+ * from the framework service registry
*/
boolean dynamic() default false; //dynamic
-
+
/**
* service discovery criteria
*/
- String serviceCriteria() default "";
-
+ String serviceCriteria() default "";
+
/**
* wait specified in millis. -1 indicates indefinite wait
*/
- int waitTimeout() default -1;
+ int waitTimeout() default -1;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/fwk/SomeFwkServiceImpl.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/fwk/SomeFwkServiceImpl.java
index 643744d..8935393 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/fwk/SomeFwkServiceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/fwk/SomeFwkServiceImpl.java
@@ -17,7 +17,7 @@
package test.fwk;
public class SomeFwkServiceImpl implements SomeFwkService {
-
+
public SomeFwkServiceImpl(){
System.out.println("SomeFrameworkClass:");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/TransactionInterceptor.java
index 702494e..b9c7977 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/TransactionInterceptor.java
@@ -29,14 +29,14 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TransactionInterceptor(ServiceFrameworkExtension myex){ //Injection of portable extension in a bean
if(myex == null) {
errorMessage += "Portable Extension Injection in Interceptor failed";
}
}
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/Transactional.java
index 98f85d4..8bd98cb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/Transactional.java
@@ -31,5 +31,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
index efafc44..64111cb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
@@ -48,10 +48,10 @@
@Inject
@Preferred
TestBean tb;
-
+
@Inject
BeanManager bm;
-
+
@Inject
@FrameworkService(serviceCriteria="TEST", dynamic=true)
SomeFwkService sfc_proxy;
@@ -82,25 +82,25 @@
+ TransactionInterceptor.aroundInvokeInvocationCount;
if (!TransactionInterceptor.errorMessage.trim().equals(""))
msg += TransactionInterceptor.errorMessage;
-
+
//check if our portable extension was called
if (!ServiceFrameworkExtension.beforeBeanDiscoveryCalled)
msg += "Portable Extension lifecycle observer method: " +
- "beforeBeanDiscovery not called";
+ "beforeBeanDiscovery not called";
if (!ServiceFrameworkExtension.afterBeanDiscoveryCalled)
msg += "Portable Extension lifecycle observer method: " +
- "afterBeanDiscovery not called or injection of BeanManager " +
- "in an observer method failed";
-
+ "afterBeanDiscovery not called or injection of BeanManager " +
+ "in an observer method failed";
+
if (!ServiceFrameworkExtension.processAnnotatedTypeCalled)
msg += "Portable Extension lifecycle observer method: process " +
- "annotated type not called";
+ "annotated type not called";
//BeanManager lookup
if (bm == null)
msg += "Injection of BeanManager into servlet failed";
-
+
//Get all beans and count the number of beans in the test package
Set<Bean<?>> allBeans = bm.getBeans(Object.class, new AnnotationLiteral<Any>(){});
@@ -113,11 +113,11 @@
//check if proxied service reference is indeed proxied
if (!Proxy.isProxyClass(sfc_proxy.getClass()))
msg += "Expected Proxied service reference, but got back an " +
- "unproxied service reference ";
+ "unproxied service reference ";
//invoke a method o
if(!sfc_proxy.fooMethod())
msg += "invocation of method on proxied service failed";
-
+
// //check if unproxied service reference is not proxied
// if (Proxy.isProxyClass(sfc_unproxied.getClass()))
// msg += "Expected unProxied service reference, but got back an " +
@@ -125,32 +125,32 @@
// //invoke a method o
// if(!sfc_unproxied.fooMethod())
// msg += "invocation of method on unproxied service failed";
-
+
for (Iterator<Bean<?>> iterator = allBeans.iterator(); iterator.hasNext();) {
Bean<?> bean = iterator.next();
if (bean.getBeanClass().getName().contains("SomeFramework")){
msg += testFrameworkBean(bean);
}
}
-
+
if (!ServiceFrameworkExtension.afterProcessBeanCalled)
msg += "Portable Extension lifecycle observer method: after " +
"ProcessBean not called for a bean registered by the portable" +
"extension";
-
+
writer.write(msg + "\n");
}
private String testFrameworkBean(Bean<?> bean) {
String msg = "";
- if (!bean.getQualifiers().contains(new AnnotationLiteral<Any>() {})
- || !bean.getQualifiers().contains(new AnnotationLiteral<Default>() {}))
+ if (!bean.getQualifiers().contains(new AnnotationLiteral<Any>() {})
+ || !bean.getQualifiers().contains(new AnnotationLiteral<Default>() {}))
msg += "FrameworkBean does not have the default expected qualifiers";
-
+
if (!bean.getScope().equals(Dependent.class))
msg += "FrameworkBean scope is not dependent";
-
+
if(!bean.getBeanClass().getName().equals(SomeFwkServiceImpl.class.getName()))
msg += "Framework Bean: Incorrect bean class";
return msg;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/build.properties b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/build.properties
index 3583686..79cb485 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/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}-make-framework-bean-available-for-injection"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/build.xml b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/build.xml
index 8894688..2556532 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,24 +48,24 @@
</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="cdi-extension.service" value="cdi-extension.service"/>
+ <param name="cdi-extension.service" value="cdi-extension.service"/>
</antcall>
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -77,10 +77,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/portable-extensions/new-bean-registration/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/client/test/client/WebTest.java
index 2c3167e..f9e9a07 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/client/test/client/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for portable extensions");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -64,7 +64,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -103,10 +103,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/portable-extensions/new-bean-registration/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/TransactionInterceptor.java
index 702494e..b9c7977 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/TransactionInterceptor.java
@@ -29,14 +29,14 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TransactionInterceptor(ServiceFrameworkExtension myex){ //Injection of portable extension in a bean
if(myex == null) {
errorMessage += "Portable Extension Injection in Interceptor failed";
}
}
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/Transactional.java
index 98f85d4..8bd98cb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/Transactional.java
@@ -31,5 +31,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/extension/FrameworkServiceFactory.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/extension/FrameworkServiceFactory.java
index ae66fd9..b5c19f0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/extension/FrameworkServiceFactory.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/extension/FrameworkServiceFactory.java
@@ -29,9 +29,9 @@
public static Object getService(final Type type, final FrameworkService fs){
//NOTE:hard-coded for this test, but ideally should get the
//service implementation from the service registry
- SomeFwkServiceInterface instance =
+ SomeFwkServiceInterface instance =
(SomeFwkServiceInterface) lookupService(type, fs.waitTimeout());
-
+
if (fs.dynamic()) {
InvocationHandler ih = new InvocationHandler() {
@Override
@@ -41,15 +41,15 @@
return method.invoke(lookupService(type, fs.waitTimeout()), args);
}
};
- instance = (SomeFwkServiceInterface)
- Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
- new Class[]{SomeFwkServiceInterface.class}, ih);
+ instance = (SomeFwkServiceInterface)
+ Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
+ new Class[]{SomeFwkServiceInterface.class}, ih);
}
return instance;
}
-
+
private static Object lookupService(Type type, int waitTimeout) {
- if (type.equals(SomeFwkServiceInterface.class)){
+ if (type.equals(SomeFwkServiceInterface.class)){
return new SomeFwkServiceImpl("test");
}
return null;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/extension/ServiceFrameworkExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/extension/ServiceFrameworkExtension.java
index e4b732b..19d88b2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/extension/ServiceFrameworkExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/extension/ServiceFrameworkExtension.java
@@ -46,8 +46,8 @@
/**
* A portable extension that supports injection of custom framework
- * services into Beans.
- *
+ * services into Beans.
+ *
* @author Sivakumar Thyagarajan
*/
public class ServiceFrameworkExtension implements Extension{
@@ -56,7 +56,7 @@
public static boolean afterBeanDiscoveryCalled = false;
public static boolean afterProcessBeanCalled = false;
public static boolean processAnnotatedTypeCalled = false;
-
+
/*
* A map of Framework Service Types to be injected and additional metadata
* about the FrameworkService to be injected.
@@ -76,27 +76,27 @@
debug("Process annotated type" + pat.getAnnotatedType().getBaseType());
processAnnotatedTypeCalled = true;
}
-
+
/**
* Observer for <code>ProcessInjectionTarget</code> events. This event is
- * fired for every Java EE component class supporting injection that may be
- * instantiated by the container at runtime. Injections points of every
- * discovered enabled Java EE component is checked to see if there is a
- * request for injection of a framework service.
+ * fired for every Java EE component class supporting injection that may be
+ * instantiated by the container at runtime. Injections points of every
+ * discovered enabled Java EE component is checked to see if there is a
+ * request for injection of a framework service.
*/
void afterProcessInjectionTarget(@Observes ProcessInjectionTarget<?> pb){
debug("AfterProcessInjectionTarget" + pb.getAnnotatedType().getBaseType());
Set<InjectionPoint> ips = pb.getInjectionTarget().getInjectionPoints();
discoverServiceInjectionPoints(ips);
}
-
+
/**
* Observer for <code>ProcessInjectionTarget</code> events. This event is
- * fired fire an event for each enabled bean, interceptor or decorator
- * deployed in a bean archive, before registering the Bean object.
- * Injections points of every discovered enabled Java EE component is
- * checked to see if there is a request for injection of a framework
- * service.
+ * fired fire an event for each enabled bean, interceptor or decorator
+ * deployed in a bean archive, before registering the Bean object.
+ * Injections points of every discovered enabled Java EE component is
+ * checked to see if there is a request for injection of a framework
+ * service.
*/
void afterProcessBean(@Observes ProcessBean pb){
afterProcessBeanCalled = true;
@@ -107,22 +107,22 @@
/*
* Discover injection points where the framework service is requested
- * through the <code>FrameworkService</code> qualifier and a map is
+ * through the <code>FrameworkService</code> qualifier and a map is
* populated for all framework services that have been requested.
*/
private void discoverServiceInjectionPoints(Set<InjectionPoint> ips) {
- for (Iterator<InjectionPoint> iterator = ips.iterator();
+ for (Iterator<InjectionPoint> iterator = ips.iterator();
iterator.hasNext();) {
InjectionPoint injectionPoint = iterator.next();
Set<Annotation> qualifs = injectionPoint.getQualifiers();
- for (Iterator<Annotation> qualifIter = qualifs.iterator();
+ for (Iterator<Annotation> qualifIter = qualifs.iterator();
qualifIter.hasNext();) {
Annotation annotation = qualifIter.next();
if (annotation.annotationType().equals(FrameworkService.class)){
printDebugForInjectionPoint(injectionPoint);
//Keep track of service-type and its attributes
System.out.println("---- Injection requested for " +
- "framework service type " + injectionPoint.getType()
+ "framework service type " + injectionPoint.getType()
+ " and annotated with dynamic="
+ injectionPoint.getAnnotated()
.getAnnotation(FrameworkService.class)
@@ -134,31 +134,31 @@
//Add to list of framework services to be injected
Type key = injectionPoint.getType();
FrameworkService value = injectionPoint.getAnnotated()
- .getAnnotation(FrameworkService.class);
+ .getAnnotation(FrameworkService.class);
if (!frameworkServicesToBeInjected.containsKey(key)){
frameworkServicesToBeInjected.put(key, new HashSet<FrameworkService>());
}
frameworkServicesToBeInjected.get(key).add(value);
System.out.println(frameworkServicesToBeInjected.size());
-
+
}
}
}
}
/**
- * Observer for <code>AfterBeanDiscovery</code> events. This
+ * Observer for <code>AfterBeanDiscovery</code> events. This
* observer method is used to register <code>Bean</code>s for the framework
- * services that have been requested to be injected.
+ * services that have been requested to be injected.
*/
void afterBeanDiscovery(@Observes AfterBeanDiscovery abd){
afterBeanDiscoveryCalled = true;
debug("After Bean Discovery");
- for (Iterator<Type> iterator = this.frameworkServicesToBeInjected.keySet().iterator();
+ for (Iterator<Type> iterator = this.frameworkServicesToBeInjected.keySet().iterator();
iterator.hasNext();) {
Type type = iterator.next();
//If the injection point's type is not a Class or Interface, we
- //don't know how to handle this.
+ //don't know how to handle this.
if (!(type instanceof Class)) {
System.out.println("Unknown type:" + type);
abd.addDefinitionError(new UnsupportedOperationException(
@@ -173,10 +173,10 @@
/*
* Add a <code>Bean</code> for the framework service requested. Instantiate
- * or discover the bean from the framework service registry,
+ * or discover the bean from the framework service registry,
* and return a reference to the service if a dynamic reference is requested.
*/
- private void addBean(AfterBeanDiscovery abd, final Type type,
+ private void addBean(AfterBeanDiscovery abd, final Type type,
final Set<FrameworkService> frameworkServices) {
for (Iterator<FrameworkService> iterator = frameworkServices.iterator(); iterator
.hasNext();) {
@@ -185,7 +185,7 @@
abd.addBean(new FrameworkServiceBean(type, frameworkService));
}
}
-
+
private final class FrameworkServiceBean implements Bean {
private final Type type;
@@ -224,7 +224,7 @@
@Override
public String getName() {
return type + "_dynamic_" + frameworkService.dynamic()
- + "_criteria_" + frameworkService.serviceCriteria()
+ + "_criteria_" + frameworkService.serviceCriteria()
+ "_waitTimeout" + frameworkService.waitTimeout();
}
@@ -235,7 +235,7 @@
s.add(new AnnotationLiteral<Any>() {});
//Add the appropriate parameters to the FrameworkService qualifier
//as requested in the injection point
- s.add(new FrameworkServiceQualifierType(frameworkService));
+ s.add(new FrameworkServiceQualifierType(frameworkService));
return s;
}
@@ -272,7 +272,7 @@
* Represents an annotation type instance of FrameworkService
* with parameters equal to those specified in the injection point
*/
- private final class FrameworkServiceQualifierType
+ private final class FrameworkServiceQualifierType
extends AnnotationLiteral<FrameworkService> implements FrameworkService {
private String serviceCriteria = "";
private boolean dynamic = false;
@@ -298,11 +298,11 @@
return this.waitTimeout;
}
}
-
+
private void debug(String string) {
if(DEBUG_ENABLED)
System.out.println("MyExtension:: " + string);
-
+
}
private void printDebugForInjectionPoint(InjectionPoint injectionPoint) {
@@ -319,5 +319,5 @@
// point
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/fwk/FrameworkService.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/fwk/FrameworkService.java
index 68ef46d..cfa70ff 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/fwk/FrameworkService.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/fwk/FrameworkService.java
@@ -33,26 +33,26 @@
/**
* A CDI Qualifier that represents a reference to a
- * service in the framework. If this qualifiers annotates an injection point,
+ * service in the framework. If this qualifiers annotates an injection point,
* the framework extension discovers and instantiates
* a service implementing the service interface type of the injection point
* and makes it available for injection to that injection point.
- */
+ */
public @interface FrameworkService {
/**
* Determines if the service reference that is injected
* refers to a dynamic proxy or the actual service reference obtained
- * from the framework service registry
+ * from the framework service registry
*/
boolean dynamic() default false; //dynamic
-
+
/**
* service discovery criteria
*/
- String serviceCriteria() default "";
-
+ String serviceCriteria() default "";
+
/**
* wait specified in millis. -1 indicates indefinite wait
*/
- int waitTimeout() default -1;
+ int waitTimeout() default -1;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/fwk/SomeFwkServiceImpl.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/fwk/SomeFwkServiceImpl.java
index fb08b08..a2e1876 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/fwk/SomeFwkServiceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/fwk/SomeFwkServiceImpl.java
@@ -17,7 +17,7 @@
package test.fwk;
public class SomeFwkServiceImpl implements SomeFwkServiceInterface {
-
+
public SomeFwkServiceImpl(String t){
System.out.println("SomeFrameworkClass:" + t);
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
index 9b9acca..caa6011 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
@@ -48,10 +48,10 @@
@Inject
@Preferred
TestBean tb;
-
+
@Inject
BeanManager bm;
-
+
@Inject
@FrameworkService(serviceCriteria="TEST", dynamic=true)
SomeFwkServiceInterface sfc_proxy;
@@ -82,25 +82,25 @@
+ TransactionInterceptor.aroundInvokeInvocationCount;
if (!TransactionInterceptor.errorMessage.trim().equals(""))
msg += TransactionInterceptor.errorMessage;
-
+
//check if our portable extension was called
if (!ServiceFrameworkExtension.beforeBeanDiscoveryCalled)
msg += "Portable Extension lifecycle observer method: " +
- "beforeBeanDiscovery not called";
+ "beforeBeanDiscovery not called";
if (!ServiceFrameworkExtension.afterBeanDiscoveryCalled)
msg += "Portable Extension lifecycle observer method: " +
- "afterBeanDiscovery not called or injection of BeanManager " +
- "in an observer method failed";
-
+ "afterBeanDiscovery not called or injection of BeanManager " +
+ "in an observer method failed";
+
if (!ServiceFrameworkExtension.processAnnotatedTypeCalled)
msg += "Portable Extension lifecycle observer method: process " +
- "annotated type not called";
+ "annotated type not called";
//BeanManager lookup
if (bm == null)
msg += "Injection of BeanManager into servlet failed";
-
+
//Get all beans and count the number of beans in the test package
Set<Bean<?>> allBeans = bm.getBeans(Object.class, new AnnotationLiteral<Any>(){});
@@ -113,11 +113,11 @@
//check if proxied service reference is indeed proxied
if (!Proxy.isProxyClass(sfc_proxy.getClass()))
msg += "Expected Proxied service reference, but got back an " +
- "unproxied service reference ";
+ "unproxied service reference ";
//invoke a method o
if(!sfc_proxy.fooMethod())
msg += "invocation of method on proxied service failed";
-
+
//check if unproxied service reference is not proxied
if (Proxy.isProxyClass(sfc_unproxied.getClass()))
msg += "Expected unProxied service reference, but got back an " +
@@ -125,32 +125,32 @@
//invoke a method o
if(!sfc_unproxied.fooMethod())
msg += "invocation of method on unproxied service failed";
-
+
for (Iterator<Bean<?>> iterator = allBeans.iterator(); iterator.hasNext();) {
Bean<?> bean = iterator.next();
if (bean.getBeanClass().getName().contains("SomeFramework")){
msg += testFrameworkBean(bean);
}
}
-
+
if (!ServiceFrameworkExtension.afterProcessBeanCalled)
msg += "Portable Extension lifecycle observer method: after " +
"ProcessBean not called for a bean registered by the portable" +
"extension";
-
+
writer.write(msg + "\n");
}
private String testFrameworkBean(Bean<?> bean) {
String msg = "";
- if (!bean.getQualifiers().contains(new AnnotationLiteral<Any>() {})
- || !bean.getQualifiers().contains(new AnnotationLiteral<Default>() {}))
+ if (!bean.getQualifiers().contains(new AnnotationLiteral<Any>() {})
+ || !bean.getQualifiers().contains(new AnnotationLiteral<Default>() {}))
msg += "FrameworkBean does not have the default expected qualifiers";
-
+
if (!bean.getScope().equals(Dependent.class))
msg += "FrameworkBean scope is not dependent";
-
+
if(!bean.getBeanClass().getName().equals(SomeFwkServiceImpl.class.getName()))
msg += "Framework Bean: Incorrect bean class";
return msg;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/build.properties b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/build.properties
index 8dd1c12..f104ad6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/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}-package-private-constructor-in-portable-extension"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/build.xml b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/build.xml
index 8894688..2556532 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,24 +48,24 @@
</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="cdi-extension.service" value="cdi-extension.service"/>
+ <param name="cdi-extension.service" value="cdi-extension.service"/>
</antcall>
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -77,10 +77,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/portable-extensions/package-private-extension-constructor/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/client/test/client/WebTest.java
index 61bcfa7..53bd9f4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/client/test/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for portable extensions");
WebTest webTest = new WebTest(args);
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -59,7 +59,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -98,10 +98,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/portable-extensions/package-private-extension-constructor/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/TransactionInterceptor.java
index a1cf768..71a8847 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/TransactionInterceptor.java
@@ -29,23 +29,23 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@Inject
TransactionInterceptor(PackagePrivateConstructorExtension myex){ //Injection of portable extension in a bean
if(myex == null) {
errorMessage += "Portable Extension Injection in Interceptor failed";
}
}
-
-
+
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage += "Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/Transactional.java
index 98f85d4..8bd98cb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/Transactional.java
@@ -31,5 +31,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/Interceptors.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/Interceptors.java
index cc58d6f..f57eca2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/Interceptors.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/Interceptors.java
@@ -21,14 +21,14 @@
public class Interceptors
{
-
+
@Inject
private PackagePrivateConstructorExtension interceptorExtension;
-
+
private Interceptors()
{
}
-
+
public boolean isInterceptorEnabled(Class<?> clazz)
{
return interceptorExtension.getEnabledInterceptors().contains(clazz);
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/PackagePrivateConstructorExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/PackagePrivateConstructorExtension.java
index 005fa32..32dbba8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/PackagePrivateConstructorExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/PackagePrivateConstructorExtension.java
@@ -43,7 +43,7 @@
this.enabledInterceptors = Collections.synchronizedSet(new
HashSet<Class<?>>());
}
-
+
@SuppressWarnings("unused")
void observeInterceptors(@Observes ProcessBean<?> pmb)
{
@@ -52,17 +52,17 @@
this.enabledInterceptors.add(pmb.getBean().getBeanClass());
}
}
-
+
Collection<Class<?>> getEnabledInterceptors()
{
return enabledInterceptors;
}
-
+
void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bdd){
System.out.println("MyExtension::beforeBeanDiscovery" + bdd);
beforeBeanDiscoveryCalled = true;
}
-
+
<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat){
System.out.println("MyExtension:Process annotated type" + pat.getAnnotatedType().getBaseType());
processAnnotatedTypeCalled = true;
@@ -73,10 +73,10 @@
pat.veto();
}
}
-
+
void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager bm){
System.out.println("MyExtension: abd: " + abd + " BeanManager: " + bm);
-
+
if (bm != null) {
//ensure a valid BeanManager is injected
afterBeanDiscoveryCalled = true;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/servlet/PackagePrivateConstructorInPortableExtensionTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/servlet/PackagePrivateConstructorInPortableExtensionTestServlet.java
index 3df88b2..616cd67 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/servlet/PackagePrivateConstructorInPortableExtensionTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/servlet/PackagePrivateConstructorInPortableExtensionTestServlet.java
@@ -39,7 +39,7 @@
@Inject
@Preferred
TestBean tb;
-
+
@Inject
BeanManager bm;
@@ -64,25 +64,25 @@
+ TransactionInterceptor.aroundInvokeInvocationCount;
if (!TransactionInterceptor.errorMessage.trim().equals(""))
msg += TransactionInterceptor.errorMessage;
-
+
//check if our portable extension was called
if (!PackagePrivateConstructorExtension.packagePrivateConstructorCalled)
msg += "Portable Extension package private constructor: not called";
-
+
if (!PackagePrivateConstructorExtension.beforeBeanDiscoveryCalled)
msg += "Portable Extension lifecycle observer method: " +
- "beforeBeanDiscovery not called";
+ "beforeBeanDiscovery not called";
if (!PackagePrivateConstructorExtension.afterBeanDiscoveryCalled)
msg += "Portable Extension lifecycle observer method: " +
- "afterBeanDiscovery not called or injection of BeanManager " +
- "in an observer method failed";
-
+ "afterBeanDiscovery not called or injection of BeanManager " +
+ "in an observer method failed";
+
if (!PackagePrivateConstructorExtension.processAnnotatedTypeCalled)
msg += "Portable Extension lifecycle observer method: process " +
- "annotated type not called";
+ "annotated type not called";
- if((bm.getBeans(PackagePrivateConstructorExtension.class, new AnnotationLiteral<Any>(){}).iterator().next().getClass()) == null)
+ if((bm.getBeans(PackagePrivateConstructorExtension.class, new AnnotationLiteral<Any>(){}).iterator().next().getClass()) == null)
msg += "Portable Extension not available for lookup through BeanManager";
writer.write(msg + "\n");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/build.properties b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/build.properties
index e72b444..d31d42e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/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}-process-injection-target"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/build.xml b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/build.xml
index 8894688..2556532 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,24 +48,24 @@
</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="cdi-extension.service" value="cdi-extension.service"/>
+ <param name="cdi-extension.service" value="cdi-extension.service"/>
</antcall>
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -77,10 +77,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/portable-extensions/process-injection-target/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/client/test/client/WebTest.java
index c574dfd..cae5ab7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/client/test/client/WebTest.java
@@ -27,8 +27,8 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String TEST_NAME =
- "portable-extensions-process-injection-target";
+ private static final String TEST_NAME =
+ "portable-extensions-process-injection-target";
private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
private final String host;
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for process injection target extension");
WebTest webTest = new WebTest(args);
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -68,7 +68,7 @@
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/portable-extensions/process-injection-target/servlet/test/extension/MyExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/extension/MyExtension.java
index 93abd53..c259ea1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/extension/MyExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/extension/MyExtension.java
@@ -54,7 +54,7 @@
it.preDestroy(instance);
}
- public void dispose(PortableExtensionInjectionTargetTestServlet instance) {
+ public void dispose(PortableExtensionInjectionTargetTestServlet instance) {
}
public Set<InjectionPoint> getInjectionPoints() {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
index bfd9aa5..457a5c0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
@@ -40,10 +40,10 @@
*/
@WebServlet(name = "mytest", urlPatterns = { "/myurl" })
public class PortableExtensionInjectionTargetTestServlet extends HttpServlet {
-
+
// @Inject
// BeanManager bm;
-
+
String msg = "";
public static volatile boolean pitCalled;
@@ -62,7 +62,7 @@
if (!pitsInjectionTargetUsed) {
msg += " MyExtension's replaced InjectionTarget is not used";
}
-
+
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/build.properties b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/build.properties
index e784675..5c09ab4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/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-portable-extension"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/build.xml b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/build.xml
index 8894688..2556532 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,24 +48,24 @@
</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="cdi-extension.service" value="cdi-extension.service"/>
+ <param name="cdi-extension.service" value="cdi-extension.service"/>
</antcall>
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -77,10 +77,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/portable-extensions/simple-portable-extension/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/client/test/client/WebTest.java
index 174d171..a20e4db 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/client/test/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for portable extensions");
WebTest webTest = new WebTest(args);
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -59,7 +59,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -98,10 +98,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/portable-extensions/simple-portable-extension/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/TransactionInterceptor.java
index c8cd767..60598e5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/TransactionInterceptor.java
@@ -29,23 +29,23 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@Inject
TransactionInterceptor(MyExtension myex){ //Injection of portable extension in a bean
if(myex == null) {
errorMessage += "Portable Extension Injection in Interceptor failed";
}
}
-
-
+
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage += "Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/Transactional.java
index 98f85d4..8bd98cb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/Transactional.java
@@ -31,5 +31,5 @@
@InterceptorBinding
public @interface Transactional {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/extension/MyExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/extension/MyExtension.java
index 0e9f1a7..d497ce4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/extension/MyExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/extension/MyExtension.java
@@ -33,12 +33,12 @@
System.out.println("In MyExtension ctor");
//new Throwable().printStackTrace();
}
-
+
void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bdd){
System.out.println("MyExtension::beforeBeanDiscovery" + bdd);
beforeBeanDiscoveryCalled = true;
}
-
+
<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat){
System.out.println("MyExtension:Process annotated type" + pat.getAnnotatedType().getBaseType());
processAnnotatedTypeCalled = true;
@@ -49,10 +49,10 @@
pat.veto();
}
}
-
+
void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager bm){
System.out.println("MyExtension: abd: " + abd + " BeanManager: " + bm);
-
+
if (bm != null) {
//ensure a valid BeanManager is injected
afterBeanDiscoveryCalled = true;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/servlet/SimplePortableExtensionTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/servlet/SimplePortableExtensionTestServlet.java
index 84a868a..a70ed50 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/servlet/SimplePortableExtensionTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/servlet/SimplePortableExtensionTestServlet.java
@@ -39,7 +39,7 @@
@Inject
@Preferred
TestBean tb;
-
+
@Inject
BeanManager bm;
@@ -64,22 +64,22 @@
+ TransactionInterceptor.aroundInvokeInvocationCount;
if (!TransactionInterceptor.errorMessage.trim().equals(""))
msg += TransactionInterceptor.errorMessage;
-
+
//check if our portable extension was called
if (!MyExtension.beforeBeanDiscoveryCalled)
msg += "Portable Extension lifecycle observer method: " +
- "beforeBeanDiscovery not called";
+ "beforeBeanDiscovery not called";
if (!MyExtension.afterBeanDiscoveryCalled)
msg += "Portable Extension lifecycle observer method: " +
- "afterBeanDiscovery not called or injection of BeanManager " +
- "in an observer method failed";
-
+ "afterBeanDiscovery not called or injection of BeanManager " +
+ "in an observer method failed";
+
if (!MyExtension.processAnnotatedTypeCalled)
msg += "Portable Extension lifecycle observer method: process " +
- "annotated type not called";
+ "annotated type not called";
- if((bm.getBeans(MyExtension.class, new AnnotationLiteral<Any>(){}).iterator().next().getClass()) == null)
+ if((bm.getBeans(MyExtension.class, new AnnotationLiteral<Any>(){}).iterator().next().getClass()) == null)
msg += "Portable Extension not available for lookup through BeanManager";
writer.write(msg + "\n");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/build.xml b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/build.xml
index b1febf6..8cb8d34 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/build.xml
@@ -84,15 +84,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the prodmeth tests)
- ant clean (cleans all the prodmeth tests)
- ant build (builds all the prodmeth tests)
- ant setup (sets up all resources for prodmeth tests)
- ant deploy (deploys all the prodmeth apps)
- ant run (Executes all the prodmeth tests)
- ant undeploy (undeploys all the prodmeth apps)
- ant unsetup (unsets all resources for prodmeth tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the prodmeth tests)
+ ant clean (cleans all the prodmeth tests)
+ ant build (builds all the prodmeth tests)
+ ant setup (sets up all resources for prodmeth tests)
+ ant deploy (deploys all the prodmeth apps)
+ ant run (Executes all the prodmeth tests)
+ ant undeploy (undeploys all the prodmeth apps)
+ ant unsetup (unsets all resources for prodmeth tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/build.properties b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/build.properties
index 99e385b..2512165 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/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}-producer-methods-disposermethods"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/build.xml b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/producer-methods/producer-method-disposes/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/client/test/client/WebTest.java
index c007bb6..c9aefa7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/client/test/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for producer methods");
WebTest webTest = new WebTest(args);
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -101,10 +101,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/producer-methods/producer-method-disposes/servlet/test/beans/BeanSetup.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/BeanSetup.java
index 8417538..661236a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/BeanSetup.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/BeanSetup.java
@@ -51,7 +51,7 @@
.println("Dispose method in BeanSetup for testQualifier called");
if (tb != null) {
disposeCalledForTestQualifierError = "dispose method for testqualifier " +
- "called without injecting TestBean";
+ "called without injecting TestBean";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/Preferred.java
index 864d313..252f8c8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/Preferred.java
@@ -32,5 +32,5 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface Preferred {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/TestQualifier.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/TestQualifier.java
index 6e89239..d2d7a9a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/TestQualifier.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/TestQualifier.java
@@ -32,5 +32,5 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface TestQualifier {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/TestRequestScopedBean.java
index 69a8672..e9cc542 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/TestRequestScopedBean.java
@@ -18,5 +18,5 @@
public class TestRequestScopedBean {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet1.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet1.java
index 7c1a597..2830873 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet1.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet1.java
@@ -35,7 +35,7 @@
@Inject @Preferred
TestRequestScopedBean trs;
-
+
@Inject @TestQualifier
TestRequestScopedBean trs2;
@@ -53,7 +53,7 @@
if (trs2 == null)
msg += "RequestScoped Bean injection into Servlet of Bean created through "
+ "programmatic instantiation in producer method (TestQualifier) failed";
-
+
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet2.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet2.java
index 535c1f4..8c6bca2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet2.java
@@ -43,7 +43,7 @@
msg += "Disposer method for preferred not called";
if (!(BeanSetup.disposeCalledForTestQualifierError.trim().length() == 0))
msg += BeanSetup.disposeCalledForTestQualifierError;
-
+
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/WebTest.java
index 1b6e97c..6210acf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/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);
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -57,7 +57,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -96,10 +96,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/producer-methods/producer-method-qualifiers/build.properties b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/build.properties
index eef7060..7e46a24 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/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}-producer-methods-qualifiers"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/build.xml b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/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/producer-methods/producer-method-qualifiers/servlet/RandomNumberGenerator.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomNumberGenerator.java
index 8ad654f..24d60dc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomNumberGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomNumberGenerator.java
@@ -28,10 +28,10 @@
@Produces @Named @RandomLessThanOrEqualToHundred int getRandomNumber(){
return lessThan100--;
}
-
+
//Generate a number greater than 100
@Produces @Named @RandomGreaterThanHundred int getRandomNumberGreatherThanHundred(){
return greaterThan100++;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/TestBean.java
index 07c355f..13f075a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/TestBean.java
@@ -16,10 +16,10 @@
import jakarta.inject.Inject;
public class TestBean {
-
- //This should use the int chosen in BeanToTestQualiferInProducerMethods
+
+ //This should use the int chosen in BeanToTestQualiferInProducerMethods
@Inject int rng;
-
+
public boolean testProducerMethod(){
return rng <= 100;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/build.properties b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/build.properties
index eef7060..7e46a24 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/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}-producer-methods-qualifiers"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/build.xml b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/producer-methods/producer-method-runtimepolymorphism/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/client/test/client/WebTest.java
index 1dc1ea1..43a12e5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/client/test/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for producer methods");
WebTest webTest = new WebTest(args);
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -59,7 +59,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -98,10 +98,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/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/CreditCardPaymentStrategy.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/CreditCardPaymentStrategy.java
index b8f3518..d3211ba 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/CreditCardPaymentStrategy.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/CreditCardPaymentStrategy.java
@@ -20,7 +20,7 @@
import jakarta.enterprise.context.RequestScoped;
-@RequestScoped
+@RequestScoped
//Note: This is request scoped bean
public class CreditCardPaymentStrategy implements PaymentStrategy, Serializable {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedProgrammatically.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedProgrammatically.java
index 3bdd168..d902327 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedProgrammatically.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedProgrammatically.java
@@ -32,5 +32,5 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface Preferred_CreatedProgrammatically {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedViaInjection.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedViaInjection.java
index d9bcb4c..402dcc9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedViaInjection.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedViaInjection.java
@@ -33,5 +33,5 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface Preferred_CreatedViaInjection {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/servlet/ProducerMethodRuntimePolymorhpismTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/servlet/ProducerMethodRuntimePolymorhpismTestServlet.java
index ad462ce..488a4e0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/servlet/ProducerMethodRuntimePolymorhpismTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/servlet/ProducerMethodRuntimePolymorhpismTestServlet.java
@@ -46,7 +46,7 @@
@Inject
@Preferred_CreatedViaInjection
PaymentStrategy payInject2;
-
+
@Inject
CreditCardPaymentStrategy ccps;// This should be the request-scoped
// instance.
@@ -68,18 +68,18 @@
if (!(payCreate instanceof PaymentStrategy))
msg += "Bean runtime polymorphism in producer method " +
- "in Preferences failed";
+ "in Preferences failed";
if (!(payInject instanceof PaymentStrategy))
msg += "Bean runtime polymorphism in producer method(dep injection " +
- "in method parameters in Preferences failed";
+ "in method parameters in Preferences failed";
if (areInjectedInstancesEqual(ccps, payInject))
msg += "Use of @New to create new Dependent object while injecting " +
- "in producer method failed";
+ "in producer method failed";
if (!areInjectedInstancesEqual(payInject, payInject2))
msg += "Session-scoped producer method created Bean injected in " +
- "different injection points are not equal";
+ "different injection points are not equal";
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/WebTest.java
index 35f7518..1661930 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Testing Programmatic Lookup");
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);
@@ -96,10 +96,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/programmatic-lookup/build.properties b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/build.properties
index 57ba5ff..baea5a9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/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-programmatic-lookup"/>
<property name="appname" value="${module}-servlet-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/build.xml b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/build.xml
index c0d904d..872f366 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/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/programmatic-lookup/servlet/test/artifacts/TestApplicationScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestApplicationScopedBean.java
index d24a76e..8d76426 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestApplicationScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestApplicationScopedBean.java
@@ -23,7 +23,7 @@
public class TestApplicationScopedBean {
@Inject
TestSessionScopedBean tsb;
-
+
public TestSessionScopedBean getSessionScopedBean(){
return tsb;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/UnproxyableTypeWithNoPublicNullConstructor.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/UnproxyableTypeWithNoPublicNullConstructor.java
index 3183cfb..6feec85 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/UnproxyableTypeWithNoPublicNullConstructor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/UnproxyableTypeWithNoPublicNullConstructor.java
@@ -24,7 +24,7 @@
public class UnproxyableTypeWithNoPublicNullConstructor implements UnproxyableType, Serializable{
//private null ctor
private UnproxyableTypeWithNoPublicNullConstructor(){
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/beans/BeanToTestProgrammaticLookup.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/beans/BeanToTestProgrammaticLookup.java
index 710df27..0416bbf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/beans/BeanToTestProgrammaticLookup.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/beans/BeanToTestProgrammaticLookup.java
@@ -62,7 +62,7 @@
System.out.println("# of Unproxyable types:"
+ numberOfUnproxyableTypes);
System.out.println("mock payment procssor:" + pp);
-
+
return (numberOfPaymentProcessors == 5)
// Async, Sync, Cheque,
// ReliableCash,
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/WebTest.java
index 64c7643..c1c9e2c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Testing Qualifiers");
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);
@@ -96,10 +96,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/qualifiers/build.properties b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/build.properties
index 0a1ecbd..2416f3e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/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-qualifiers"/>
<property name="appname" value="${module}-servlet-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/build.xml b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/build.xml
index c0d904d..872f366 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/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/qualifiers/servlet/QualifierServlet.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/QualifierServlet.java
index 5f32d68..3148473 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/QualifierServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/QualifierServlet.java
@@ -39,7 +39,7 @@
@WebInitParam(name = "n1", value = "v1"),
@WebInitParam(name = "n2", value = "v2") })
public class QualifierServlet extends HttpServlet {
-
+
@Inject
BeanToTestInitializerMethodInjection tb;
@@ -48,7 +48,7 @@
@Inject
BeanToTestAny tb3;
-
+
@Inject
BeanToTestMultipleQualifiers tb4;
@@ -78,7 +78,7 @@
msg += "Qualifier based injection into BeanToTestConstructorMethodInjection (constructor method injection) Failed";
if (!tb3.testInjection())
msg += "Qualifier based @Any injection into BeanToTestAny Failed";
- if (!tb4.testInjection())
+ if (!tb4.testInjection())
msg += "Multiple qualifiers test failed";
writer.write("initParams: " + msg + "\n");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestConstructorInjection.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestConstructorInjection.java
index 460f320..4e6755c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestConstructorInjection.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestConstructorInjection.java
@@ -28,14 +28,14 @@
public class BeanToTestConstructorInjection {
private PaymentProcessor syncPay;
private PaymentProcessor asyncPay;
-
+
@Inject
public BeanToTestConstructorInjection(@Synchronous PaymentProcessor syncPay,
@Asynchronous PaymentProcessor asyncPay) {
this.syncPay = syncPay;
this.asyncPay = asyncPay;
}
-
+
public boolean testInjection(){
return (syncPay instanceof SynchronousPaymentProcessor &&
asyncPay instanceof AsynchronousPaymentProcessor);
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestInitializerMethodInjection.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestInitializerMethodInjection.java
index 0237978..4a892ea 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestInitializerMethodInjection.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestInitializerMethodInjection.java
@@ -27,14 +27,14 @@
public class BeanToTestInitializerMethodInjection {
private PaymentProcessor syncPay;
private PaymentProcessor asyncPay;
-
+
@Inject
public void setPaymentProcessor(@Synchronous PaymentProcessor syncPay,
@Asynchronous PaymentProcessor asyncPay) {
this.syncPay = syncPay;
this.asyncPay = asyncPay;
}
-
+
public boolean testInjection(){
return (syncPay instanceof SynchronousPaymentProcessor &&
asyncPay instanceof AsynchronousPaymentProcessor);
diff --git a/appserver/tests/appserv-tests/devtests/cdi/report.xml b/appserver/tests/appserv-tests/devtests/cdi/report.xml
index a86c937..df9bf70 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/report.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/report.xml
@@ -29,8 +29,8 @@
<xslt style="${stylesheet}" in="${xmlfile}" out="${htmlfile}" basedir="." destdir="." failOnNoResources="false" />
</then>
</if>
-
-
+
+
<antcall target="report-sh" />
</target>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/run_test.sh b/appserver/tests/appserv-tests/devtests/cdi/run_test.sh
index be54fc5..28c40e0 100755
--- a/appserver/tests/appserv-tests/devtests/cdi/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/cdi/run_test.sh
@@ -17,52 +17,52 @@
test_run(){
printf "\n%s \n\n" "===== TEST RUN - MAIN ====="
-
- # Fix for false positive
- echo "<property name=\"libraries\" value=\"' '\"/>" >> smoke-tests/simple-wab-with-cdi/build.properties
- find . -name "RepRunConf.txt" | xargs rm -f
- rm -rf *.output alltests.res ${APS_HOME}/test_results*
-
- # Run the tests
- set +e
- ant clean -e -q > /dev/null
-
- printf "\n%s \n\n" "===== TEST RUN - STARTING GLASSFISH AND DB ====="
- ${S1AS_HOME}/bin/asadmin start-domain
- ${S1AS_HOME}/bin/asadmin start-database
-
- printf "\n%s \n\n" "===== TEST RUN - RUNNING TESTS for ${TARGET} ====="
- ant ${TARGET} | tee ${TEST_RUN_LOG}
-
- printf "\n%s \n\n" "===== TEST RUN - STOPPING GLASSFISH AND DB ====="
- ${S1AS_HOME}/bin/asadmin stop-domain
- ${S1AS_HOME}/bin/asadmin stop-database
- set -e
+
+ # Fix for false positive
+ echo "<property name=\"libraries\" value=\"' '\"/>" >> smoke-tests/simple-wab-with-cdi/build.properties
+ find . -name "RepRunConf.txt" | xargs rm -f
+ rm -rf *.output alltests.res ${APS_HOME}/test_results*
+
+ # Run the tests
+ set +e
+ ant clean -e -q > /dev/null
+
+ printf "\n%s \n\n" "===== TEST RUN - STARTING GLASSFISH AND DB ====="
+ ${S1AS_HOME}/bin/asadmin start-domain
+ ${S1AS_HOME}/bin/asadmin start-database
+
+ printf "\n%s \n\n" "===== TEST RUN - RUNNING TESTS for ${TARGET} ====="
+ ant ${TARGET} | tee ${TEST_RUN_LOG}
+
+ printf "\n%s \n\n" "===== TEST RUN - STOPPING GLASSFISH AND DB ====="
+ ${S1AS_HOME}/bin/asadmin stop-domain
+ ${S1AS_HOME}/bin/asadmin stop-database
+ set -e
}
get_test_target(){
printf "\n%s \n\n" "===== GETTING TEST TARGET ====="
- case ${1} in
- cdi_all )
- TARGET=all
- export TARGET;;
- esac
+ case ${1} in
+ cdi_all )
+ TARGET=all
+ export TARGET;;
+ esac
}
run_test_id(){
- unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
- cd `dirname ${0}`
- test_init
- get_test_target ${1}
- test_run
- check_successful_run
+ unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
+ cd `dirname ${0}`
+ test_init
+ get_test_target ${1}
+ test_run
+ check_successful_run
generate_junit_report ${1}
change_junit_report_class_names
}
list_test_ids(){
- echo cdi_all
+ echo cdi_all
}
OPT=${1}
@@ -70,9 +70,9 @@
source `dirname ${0}`/../../../common_test.sh
case ${OPT} in
- list_test_ids )
- list_test_ids;;
- run_test_id )
- trap "copy_test_artifacts ${TEST_ID}" EXIT
- run_test_id ${TEST_ID} ;;
+ list_test_ids )
+ list_test_ids;;
+ run_test_id )
+ trap "copy_test_artifacts ${TEST_ID}" EXIT
+ run_test_id ${TEST_ID} ;;
esac
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/build.xml b/appserver/tests/appserv-tests/devtests/cdi/scopes/build.xml
index 7b3acdd..16c0c4c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/build.xml
@@ -91,15 +91,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the scopes tests)
- ant clean (cleans all the scopes tests)
- ant build (builds all the scopes tests)
- ant setup (sets up all resources for scopes tests)
- ant deploy (deploys all the scopes apps)
- ant run (Executes all the scopes tests)
- ant undeploy (undeploys all the scopes apps)
- ant unsetup (unsets all resources for scopes tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the scopes tests)
+ ant clean (cleans all the scopes tests)
+ ant build (builds all the scopes tests)
+ ant setup (sets up all resources for scopes tests)
+ ant deploy (deploys all the scopes apps)
+ ant run (Executes all the scopes tests)
+ ant undeploy (undeploys all the scopes apps)
+ ant unsetup (unsets all resources for scopes tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/build.properties b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/build.properties
index c1893f3..ddc50c1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/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}-dependent-scope"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/build.xml b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/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/scopes/dependent-scope/servlet/test/beans/TestDependentScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestDependentScopedBean.java
index b978e60..0a59ebe 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestDependentScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestDependentScopedBean.java
@@ -23,11 +23,11 @@
//into session scoped or conversation scoped bean
public class TestDependentScopedBean {
private static int instantiationCounter = 0;
-
+
public TestDependentScopedBean(){
instantiationCounter++;
}
-
+
public int getInstancesCount(){
return this.instantiationCounter;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestRequestScopedBean.java
index 191af9c..99e7d17 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestRequestScopedBean.java
@@ -24,7 +24,7 @@
@Inject
private TestDependentScopedBean tdsb;
-
+
public TestDependentScopedBean getDependentScopedBean(){
return this.tdsb;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/build.properties b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/build.properties
index eafeb8f..afe6230 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/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}-new-qualifier"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/build.xml b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/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/scopes/new-qualifier/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/beans/TestRequestScopedBean.java
index 972ead4..a611959 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/beans/TestRequestScopedBean.java
@@ -21,15 +21,15 @@
@RequestScoped
public class TestRequestScopedBean {
private static int instantiationCount = 0;
-
+
public TestRequestScopedBean(){
instantiationCount++;
}
-
+
public int getInstantiationCount(){
System.out.println("Instances of TestRequestScopedBean=" + instantiationCount);
return this.instantiationCount;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/servlets/NewQualifierTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/servlets/NewQualifierTestServlet.java
index 975a355..2d6afc5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/servlets/NewQualifierTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/servlets/NewQualifierTestServlet.java
@@ -35,7 +35,7 @@
@Inject
TestRequestScopedBean trsb;
-
+
@Inject
TestRequestScopedBean anotherRefToRequestScopedBean;
@@ -46,7 +46,7 @@
@Inject
@New
Instance<TestRequestScopedBean> newRequestScopedBeanProgrammaticLookup;
-
+
@Inject
@New(TestRequestScopedBean.class)
Instance<TestRequestScopedBean> newRequestScopedBeanProgrammaticLookup2;
@@ -66,19 +66,19 @@
if (!(trsb.getInstantiationCount() == 3))
msg += "Request scoped bean created more than the expected number of times";
- if (!areInjectecedInstancesEqual(trsb, anotherRefToRequestScopedBean))
+ if (!areInjectecedInstancesEqual(trsb, anotherRefToRequestScopedBean))
msg += "Two references to the same request scoped bean are not equal";
-
+
if (areInjectecedInstancesEqual(trsb, newRequestScopedBean))
msg += "Request scoped Bean injected with @New qualifier must not be equal to the normal Request scoped bean";
if (!testIsClientProxy(trsb, TestRequestScopedBean.class))
msg += "Request scoped beans must be injected as a client proxy";
-
- if(newRequestScopedBeanProgrammaticLookup.get() == null)
+
+ if(newRequestScopedBeanProgrammaticLookup.get() == null)
msg += "A new instance of Request Scoped Bean obtained through programmatic lookup failed";
-
- if(newRequestScopedBeanProgrammaticLookup2.get() == null)
+
+ if(newRequestScopedBeanProgrammaticLookup2.get() == null)
msg += "A new(complex type specification scenario) instance of Request Scoped Bean obtained through programmatic lookup failed";
writer.write(msg + "\n");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/build.properties b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/build.properties
index d64848e..128dae6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="cdi-hello-mdb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="simple.client" value="com.sun.s1asdev.cdi.hello.mdb.client.Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="beans.xml" value="descriptor/beans.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/build.xml b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/build.xml
index 0d7504b..ef650bb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="src"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class,**/*Hello*" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, test/ejb/session/HelloSless*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -77,20 +77,20 @@
</target>
<target name="run_standaloneclient" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/jakarta.jms-api.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java
index 5fdac05..07979c4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java
@@ -147,7 +147,7 @@
message.setBooleanProperty("flag", true);
message.setIntProperty("num", 2);
sendMsgs((jakarta.jms.Queue) dest, message, num);
-
+
System.out.println("remote bean:" + helloStatelessRemoteBean);
String response = helloStatelessRemoteBean.hello();
if (!response.equals("hello")){
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/BeanToTestTimerUse.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/BeanToTestTimerUse.java
index 5796543..f6d3de1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/BeanToTestTimerUse.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/BeanToTestTimerUse.java
@@ -19,19 +19,19 @@
import jakarta.inject.Singleton;
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
@Singleton
public class BeanToTestTimerUse implements java.io.Serializable{
private boolean testToCheckIfTimerInvoked = false;
-
+
public void setResult(boolean val) {
this.testToCheckIfTimerInvoked = val;
}
-
+
public boolean getResult() {
return this.testToCheckIfTimerInvoked;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestApplicationScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestApplicationScopedBean.java
index f4fdd29..d9d42b8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestApplicationScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestApplicationScopedBean.java
@@ -18,7 +18,7 @@
import jakarta.enterprise.context.ApplicationScoped;
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
@ApplicationScoped
public class TestApplicationScopedBean
{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestRequestScopedBean.java
index 118503b..0add846 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestRequestScopedBean.java
@@ -18,7 +18,7 @@
import jakarta.enterprise.context.RequestScoped;
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
@RequestScoped
public class TestRequestScopedBean
{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
index c7d0dca..e2bd095 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
@@ -58,7 +58,7 @@
TestApplicationScopedBean tasb;
@Inject
TestRequestScopedBean trsb;
-
+
@Inject BeanManager bm;
public void onMessage(Message message) {
@@ -88,7 +88,7 @@
if (trsb == null)
throw new Exception(
"Injection of request scoped Bean in MDB failed");
-
+
connection = qcFactory.createQueueConnection();
QueueSession session = connection.createQueueSession(false,
Session.AUTO_ACKNOWLEDGE);
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/Hello1.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/Hello1.java
index 6773b31..2a5dd3c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/Hello1.java
@@ -19,5 +19,5 @@
public interface Hello1 {
public void hello(String s);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java
index 9ee988c..38971df 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java
@@ -34,9 +34,9 @@
System.out.println("Business method marked with @Remove called in " +
msg);
}
-
+
@PreDestroy public void myPreDestroyMethod() {
- System.out.println("PRE-DESTROY callback received in " + msg);
+ System.out.println("PRE-DESTROY callback received in " + msg);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java
index 2546fdb..085c90c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java
@@ -22,7 +22,7 @@
// bean only implements one interface it is assumed to be
// a local business interface.
-@Stateless(description="my stateless bean description")
+@Stateless(description="my stateless bean description")
public class HelloStateless implements Hello1 {
public void hello(String s) {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
index 3aebd35..3f21763 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
@@ -37,7 +37,7 @@
@Inject
BeanManager bm;
-
+
@Inject BeanToTestTimerUse timerBeanTest;
@PostConstruct
@@ -55,10 +55,10 @@
msg += "Injection of Application scoped bean in EJB remote method failed";
if (trsb == null)
msg += "Injection of Request scoped bean in EJB remote method failed";
-
- if (!timerBeanTest.getResult())
+
+ if (!timerBeanTest.getResult())
msg += "Injection of session scoped bean into EJB timer beans failed";
-
+
return msg;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/build.properties b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/build.properties
index 45980f4..8299b52 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/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}-singleton-scope"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/build.xml b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/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/scopes/singleton-scope/servlet/test/beans/TestSessionScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSessionScopedBean.java
index 13dca77..5857944 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSessionScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSessionScopedBean.java
@@ -26,7 +26,7 @@
public class TestSessionScopedBean implements Serializable{
@Inject
Instance<TestSingletonScopedBean> tssInstance;
-
+
public TestSingletonScopedBean getSingletonScopedBean(){
return tssInstance.get();
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSingletonScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSingletonScopedBean.java
index b21de98..cddc639 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSingletonScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSingletonScopedBean.java
@@ -24,11 +24,11 @@
//into session scoped or conversation scoped bean
public class TestSingletonScopedBean {
private static int instantiationCounter = 0;
-
+
public TestSingletonScopedBean(){
instantiationCounter++;
}
-
+
public int getInstancesCount(){
return this.instantiationCounter;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/servlets/SingletonScopedServlet.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/servlets/SingletonScopedServlet.java
index a7694cb..cb00f2b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/servlets/SingletonScopedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/servlets/SingletonScopedServlet.java
@@ -64,7 +64,7 @@
}
if (bm1 == null)
msg += "BeanManager Injection via component environment lookup failed";
- if (tb.getInstancesCount() > 1)
+ if (tb.getInstancesCount() > 1)
msg += "Singleton scoped bean must be created only once";
if (!areInjectecedInstancesEqual(tb, anotherInjectedSingletonInstance))
msg += "Two different injection of a Singleton pseudo-scoped Bean must point to the same bean instance";
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/build.xml
index 53a972c..44dbc94 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/build.xml
@@ -30,7 +30,7 @@
&commonBuild;
&commonRun;
&reporting;
-
+
<property name="smoke-target" value="all"/>
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
@@ -109,7 +109,7 @@
</else>
</if>
<ant dir="simple-ejb-cdi" target="${smoke-target}"/>
-
+
<!--
Not running until
https://issues.jboss.org/browse/WELD-1345 is fixed. (fixed in 2.0.0.Beta5)
@@ -131,15 +131,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the smoke tests)
- ant clean (cleans all the smoke tests)
- ant build (builds all the smoke tests)
- ant setup (sets up all resources for smoke tests)
- ant deploy (deploys all the smoke apps)
- ant run (Executes all the smoke tests)
- ant undeploy (undeploys all the smoke apps)
- ant unsetup (unsets all resources for smoke tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the smoke tests)
+ ant clean (cleans all the smoke tests)
+ ant build (builds all the smoke tests)
+ ant setup (sets up all resources for smoke tests)
+ ant deploy (deploys all the smoke apps)
+ ant run (Executes all the smoke tests)
+ ant undeploy (undeploys all the smoke apps)
+ ant unsetup (unsets all resources for smoke tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/WebTest.java
index fee7d18..98b3832 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/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/smoke-tests/cdi-servlet-3.0-annotation/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/build.properties
index d2f36aa..f517821 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/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"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/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/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestBean.java
index 6d059e2..c436395 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestBean.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
//This bean implements Serializable as it needs to be placed into a Stateful Bean
public class TestBean
{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java
index af6fae3..f25dcf1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java
@@ -35,8 +35,8 @@
@Inject TestBean tb;
@Inject BeanManager bm;
BeanManager bm1;
-
- @Inject
+
+ @Inject
private transient org.jboss.logging.Logger log;
public void service(HttpServletRequest req, HttpServletResponse res)
@@ -55,7 +55,7 @@
msg += "BeanManager Injection via component environment lookup failed";
}
if (bm1 == null) msg += "BeanManager Injection via component environment lookup failed";
-
+
System.out.println("BeanManager is " + bm);
System.out.println("BeanManager via lookup is " + bm1);
writer.write("initParams: " + msg + "\n");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/WebTest.java
index b2da7d5..db5f68e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/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/smoke-tests/cdi-servlet-filter-3.0-annotation/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/build.properties
index a9ba810..15033a9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/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-filter-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/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/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestBean.java
index 6d059e2..c436395 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestBean.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
//This bean implements Serializable as it needs to be placed into a Stateful Bean
public class TestBean
{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/WebTest.java
index bcd25ae..3e03786 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/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/smoke-tests/optional-unbundled-beans/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties
index 36b4298..1997037 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-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}-optional-unbundled-beans"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
index 2ba7c3a..9d49072 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/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,27 +47,27 @@
<!-- remove the class that needs to be unavailable in the deployment archive -->
<delete file="${build.classes.dir}/ClassUnavailableAtRuntime.class"/>
-
+
</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}"/>
@@ -79,10 +79,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/smoke-tests/optional-unbundled-beans/servlet/ClassUnavailableAtRuntime.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/ClassUnavailableAtRuntime.java
index 3bae9d7..b22180f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/ClassUnavailableAtRuntime.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/ClassUnavailableAtRuntime.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-//A Test parent Bean class that is available
+//A Test parent Bean class that is available
//during compilation but is not packaged at runtime
public class ClassUnavailableAtRuntime extends TestService {
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestBean.java
index 6d059e2..c436395 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestBean.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
//This bean implements Serializable as it needs to be placed into a Stateful Bean
public class TestBean
{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java
index 3119bc5..6cf77cc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java
@@ -40,8 +40,8 @@
@Inject TestBean tb;
@Inject BeanManager bm;
BeanManager bm1;
-
- @Inject
+
+ @Inject
private transient org.jboss.logging.Logger log;
public void service(HttpServletRequest req, HttpServletResponse res)
@@ -60,7 +60,7 @@
msg += "BeanManager Injection via component environment lookup failed";
}
if (bm1 == null) msg += "BeanManager Injection via component environment lookup failed";
-
+
//Ensure that the OptionalService Bean is not registered.
Set<Bean<?>> optionalServiceBeans = bm.getBeans(TestService.class,new AnnotationLiteral<Any>() {});
boolean optionalServiceAvailable = false;
@@ -68,12 +68,12 @@
.hasNext();) {
Bean<?> b = iterator.next();
System.out.println("-----" + b + " " + b.getClass() + " " + b.getBeanClass().getCanonicalName());
- if (b.getBeanClass().getCanonicalName().contains("Optional")) optionalServiceAvailable = true;
+ if (b.getBeanClass().getCanonicalName().contains("Optional")) optionalServiceAvailable = true;
}
-
+
//The OptionalService Bean was not added to the WAR and hence must not available through the BM.
if (optionalServiceAvailable) msg += "OptionalServiceBean is registered, though it was not included in the WAR";
-
+
System.out.println("BeanManager is " + bm);
System.out.println("BeanManager via lookup is " + bm1);
writer.write("initParams: " + msg + "\n");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.properties
index e8ca782..bdb5904 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-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/smoke-tests/simple-ear/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.xml
index 5b75ecf..5610e78 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
@@ -46,8 +46,8 @@
<param name="src" value="ejb"/>
</antcall>
- <javac classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
-
+ <javac classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
+
</javac>
<!--
<antcall target="compile-common">
@@ -62,15 +62,15 @@
<param name="ejbjar.classes" value="**/Foo.class,**/Hello.class,**/HelloRemote.class,**/Singleton*.class,**/HelloStateless.class,**/HelloSingleton.class,**/FooManagedBean.class,**/BarManagedBean.class, **/FooBarManagedBean.class, **/ManagedSuper.class"/>
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
<target name="run" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -79,10 +79,10 @@
<arg line="${http.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/client/Client.java
index 0cfdf55..7a0731c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -39,55 +39,55 @@
private static Integer appLevelViaLookup;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
- System.out.println("appLevelViaLookup = '" +
- appLevelViaLookup + "'");
+ System.out.println("appLevelViaLookup = '" +
+ appLevelViaLookup + "'");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
-
+
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null){
+ URL u = new URL(url);
+
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null){
System.out.println("<response>:"+ line);
if (line.trim().length() > 0) {
stat.addStatus("local main", stat.FAIL);
return;
}
}
- if(code != 200) {
+ if(code != 200) {
stat.addStatus("local main", stat.FAIL);
return;
- }
- stat.addStatus("local main", stat.PASS);
+ }
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java
index 9053e6a..afa2885 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java
@@ -29,7 +29,7 @@
@PostConstruct
private void init() {
- System.out.println("In BarManagedBean::init() " + this);
+ System.out.println("In BarManagedBean::init() " + this);
}
public void bar() {
@@ -39,12 +39,12 @@
@PreDestroy
private void destroy() {
- System.out.println("In BarManagedBean::destroy() ");
+ System.out.println("In BarManagedBean::destroy() ");
}
public String toString() {
- return "BarManagedBean this = " + super.toString() +
- " s = " + s + " , ds = " + ds;
+ return "BarManagedBean this = " + super.toString() +
+ " s = " + s + " , ds = " + ds;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooBarManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooBarManagedBean.java
index 46cc3c3..594a8f4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooBarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooBarManagedBean.java
@@ -23,12 +23,12 @@
@PostConstruct
private void init() {
- System.out.println("In FooBarManagedBean::init() " + this);
+ System.out.println("In FooBarManagedBean::init() " + this);
}
-
+
@PreDestroy
private void destroy() {
- System.out.println("In FooBarManagedBean::destroy() ");
+ System.out.println("In FooBarManagedBean::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
index 5ee1488..ed9d3fd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
@@ -34,33 +34,33 @@
@PostConstruct
private void init() {
- System.out.println("In FooManagedBean::init() " + this);
+ System.out.println("In FooManagedBean::init() " + this);
}
-
+
public String getName() {
- return "somemanagedbean";
+ return "somemanagedbean";
}
public void foo() {
- System.out.println("In FooManagedBean::foo() ");
- bmb.bar();
+ System.out.println("In FooManagedBean::foo() ");
+ bmb.bar();
}
public Object getThis() {
- return this;
+ return this;
}
@PreDestroy
private void destroy() {
- System.out.println("In FooManagedBean::destroy() ");
+ System.out.println("In FooManagedBean::destroy() ");
}
public String toString() {
- return "FooManagedBean this = " + super.toString() +
- " s = " + s + " , orb = " + orb +
- " , bmb = " + bmb + " , em = " + em;
+ return "FooManagedBean this = " + super.toString() +
+ " s = " + s + " , orb = " + orb +
+ " , bmb = " + bmb + " , em = " + em;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java
index 6d9206d..094e293 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java
@@ -39,9 +39,9 @@
@Resource(name="java:module/env/MORB2")
private ORB orb;
- @Resource
+ @Resource
private FooManagedBean foo;
-
+
@Resource(name="foo2ref", mappedName="java:module/somemanagedbean")
private FooManagedBean foo2;
@@ -59,59 +59,59 @@
@EJB(name="java:app/env/appLevelEjbRef")
private Hello hello;
-
+
String appName;
String moduleName;
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("HelloSingleton::init()");
+ System.out.println("HelloSingleton::init()");
- System.out.println("myString = '" + myString + "'");
- if( (myString == null) || !(myString.equals("myString") ) ) {
- throw new RuntimeException("Invalid value " + myString + " for myString");
- }
+ System.out.println("myString = '" + myString + "'");
+ if( (myString == null) || !(myString.equals("myString") ) ) {
+ throw new RuntimeException("Invalid value " + myString + " for myString");
+ }
- appName = (String) sessionCtx.lookup("java:app/AppName");
- moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
+ appName = (String) sessionCtx.lookup("java:app/AppName");
+ moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
- ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
- ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
+ ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
+ ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
- System.out.println("AppName = " + appName);
- System.out.println("ModuleName = " + moduleName);
+ System.out.println("AppName = " + appName);
+ System.out.println("ModuleName = " + moduleName);
- foo4 = (FooManagedBean) sessionCtx.lookup("java:module/somemanagedbean");
- foo5 = (FooManagedBean) sessionCtx.lookup("java:app/" + moduleName +
- "/somemanagedbean");
- foo6 = (Foo) sessionCtx.lookup("java:app/" + moduleName +
- "/somemanagedbean");
- foo7 = (FooManagedBean) sessionCtx.lookup("java:comp/env/foo2ref");
- foo8 = (Foo) sessionCtx.lookup("java:comp/env/foo3ref");
+ foo4 = (FooManagedBean) sessionCtx.lookup("java:module/somemanagedbean");
+ foo5 = (FooManagedBean) sessionCtx.lookup("java:app/" + moduleName +
+ "/somemanagedbean");
+ foo6 = (Foo) sessionCtx.lookup("java:app/" + moduleName +
+ "/somemanagedbean");
+ foo7 = (FooManagedBean) sessionCtx.lookup("java:comp/env/foo2ref");
+ foo8 = (Foo) sessionCtx.lookup("java:comp/env/foo3ref");
}
public String hello() {
-
- System.out.println("HelloSingleton::hello()");
+
+ System.out.println("HelloSingleton::hello()");
- foo.foo();
- foo2.foo();
- foo3.foo();
+ foo.foo();
+ foo2.foo();
+ foo3.foo();
- foo4.foo();
- foo5.foo();
- foo6.foo();
- foo7.foo();
- foo8.foo();
+ foo4.foo();
+ foo5.foo();
+ foo6.foo();
+ foo7.foo();
+ foo8.foo();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
private void destroy() {
- System.out.println("HelloSingleton::destroy()");
+ System.out.println("HelloSingleton::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java
index b094856..87b5f79 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java
@@ -30,7 +30,7 @@
@Resource(name="java:module/MORB1")
private ORB orb;
-
+
@EJB(name="lookupref1", lookup="java:app/env/AS1")
private Hello lookupref1;
@@ -41,51 +41,51 @@
private HelloRemote lookupref3;
// declare component-level dependency using fully-qualified
- // java:comp/env form.
+ // java:comp/env form.
@Resource(name="java:comp/env/foo") SessionContext sessionCtx;
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("HelloStateless::init()");
+ System.out.println("HelloStateless::init()");
}
public String hello() {
- System.out.println("In HelloStateless::hello()");
+ System.out.println("In HelloStateless::hello()");
- String appName = (String) sessionCtx.lookup("java:app/AppName");
- String moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
- System.out.println("AppName = " + appName);
- System.out.println("ModuleName = " + moduleName);
+ String appName = (String) sessionCtx.lookup("java:app/AppName");
+ String moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
+ System.out.println("AppName = " + appName);
+ System.out.println("ModuleName = " + moduleName);
- ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
- ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
+ ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
+ ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
- Hello s1 = (Hello) sessionCtx.lookup("java:global/" +
- appName + "/" +
- moduleName + "/" +
- "HelloSingleton");
+ Hello s1 = (Hello) sessionCtx.lookup("java:global/" +
+ appName + "/" +
+ moduleName + "/" +
+ "HelloSingleton");
- Hello s2 = (Hello) sessionCtx.lookup("java:app/" +
- moduleName + "/" +
- "HelloSingleton");
+ Hello s2 = (Hello) sessionCtx.lookup("java:app/" +
+ moduleName + "/" +
+ "HelloSingleton");
- // Rely on default to resolve "java:comp/env/ declared resource
- SessionContext sc1 = (SessionContext)
- sessionCtx.lookup("foo");
+ // Rely on default to resolve "java:comp/env/ declared resource
+ SessionContext sc1 = (SessionContext)
+ sessionCtx.lookup("foo");
- SessionContext sc2 = (SessionContext)
- sc1.lookup("java:comp/env/foo");
+ SessionContext sc2 = (SessionContext)
+ sc1.lookup("java:comp/env/foo");
- Integer envEntry = (Integer)
- sc1.lookup("java:app/env/value1");
- System.out.println("java:ap/env/value1 = " + envEntry);
+ Integer envEntry = (Integer)
+ sc1.lookup("java:app/env/value1");
+ System.out.println("java:ap/env/value1 = " + envEntry);
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
private void destroy() {
- System.out.println("HelloStateless::destroy()");
+ System.out.println("HelloStateless::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java
index 3401b41..649d160 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java
@@ -28,17 +28,17 @@
@PostConstruct
private void init() {
- System.out.println("In ManagedSuper::init() " + this);
+ System.out.println("In ManagedSuper::init() " + this);
}
@PreDestroy
private void destroy() {
- System.out.println("In ManagedSuper::destroy() ");
+ System.out.println("In ManagedSuper::destroy() ");
}
public String toString() {
- return "ManagedSuper this = " + super.toString() +
- " s = " + s + " , ds = " + ds;
+ return "ManagedSuper this = " + super.toString() +
+ " s = " + s + " , ds = " + ds;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java
index bcda194..4615ed7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java
@@ -28,7 +28,7 @@
public void init() {
System.out.println("In SingletonBean2::init()");
}
-
+
@PreDestroy
public void destroy() {
System.out.println("In SingletonBean2::destroy()");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java
index 084ed7a..e277b06 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java
@@ -28,7 +28,7 @@
public void init() {
System.out.println("In SingletonBean3::init()");
}
-
+
@PreDestroy
public void destroy() {
System.out.println("In SingletonBean3::destroy()");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java
index 7386388..f2f340b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java
@@ -27,7 +27,7 @@
public void init() {
System.out.println("In SingletonBean4::init()");
}
-
+
@PreDestroy
public void destroy() {
System.out.println("In SingletonBean4::destroy()");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
index 134e7a8..98665b6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
@@ -33,27 +33,27 @@
@PostConstruct
private void init() {
- System.out.println("In Foo2ManagedBean::init() " + this);
+ System.out.println("In Foo2ManagedBean::init() " + this);
}
-
+
public void foo() {
- System.out.println("In Foo2ManagedBean::foo() ");
+ System.out.println("In Foo2ManagedBean::foo() ");
}
public Object getThis() {
- return this;
+ return this;
}
@PreDestroy
private void destroy() {
- System.out.println("In Foo2ManagedBean::destroy() ");
+ System.out.println("In Foo2ManagedBean::destroy() ");
}
public String toString() {
- return "Foo2ManagedBean this = " +
- " s = " + s + " , orb = " + orb +
- " , em = " + em;
+ return "Foo2ManagedBean this = " +
+ " s = " + s + " , orb = " + orb +
+ " , em = " + em;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/FooBarManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/FooBarManagedBean.java
index 46cc3c3..594a8f4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/FooBarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/FooBarManagedBean.java
@@ -23,12 +23,12 @@
@PostConstruct
private void init() {
- System.out.println("In FooBarManagedBean::init() " + this);
+ System.out.println("In FooBarManagedBean::init() " + this);
}
-
+
@PreDestroy
private void destroy() {
- System.out.println("In FooBarManagedBean::destroy() ");
+ System.out.println("In FooBarManagedBean::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.properties
index e0533ab..4bc3f73 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.properties
@@ -15,24 +15,24 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="simple-ejb-cdi"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="simple.client2" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient2"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="beans.xml" value="descriptor/beans.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.xml
index 00cdb90..8d877cd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.xml
@@ -31,62 +31,62 @@
<target name="all" depends="build,deploy,run,undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common" />
- <delete file="client/Client.java" />
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete file="client/Client.java" />
+ </target>
- <target name="compile" depends="clean">
- <copy file="client/Client.java.token" tofile="client/Client.java" />
- <replace file="client/Client.java" token="@ORB_PORT@" value="${orb.port}" />
+ <target name="compile" depends="clean">
+ <copy file="client/Client.java.token" tofile="client/Client.java" />
+ <replace file="client/Client.java" token="@ORB_PORT@" value="${orb.port}" />
- <antcall target="compile-common">
- <param name="src" value="ejb" />
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="client" />
- </antcall>
- </target>
+ <antcall target="compile-common">
+ <param name="src" value="ejb" />
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="client" />
+ </antcall>
+ </target>
- <target name="build" depends="compile">
- <antcall target="build-ear-common">
- <param name="ejbjar.classes" value="**/Sful*.class,**/Sless*.class, **/TestBean.class" />
- <param name="appclientjar.classes" value="**/Client.class,**/Sful.class,**/Sless.class" />
- </antcall>
- </target>
+ <target name="build" depends="compile">
+ <antcall target="build-ear-common">
+ <param name="ejbjar.classes" value="**/Sful*.class,**/Sless*.class, **/TestBean.class" />
+ <param name="appclientjar.classes" value="**/Client.class,**/Sful.class,**/Sless.class" />
+ </antcall>
+ </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">
- <antcall target="runclient-common" />
- </target>
+ <target name="run" depends="init-common">
+ <antcall target="runclient-common" />
+ </target>
- <target name="run_standaloneclient" 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="${simple.client}">
- <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}" />
- </java>
- </target>
+ <target name="run_standaloneclient" 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="${simple.client}">
+ <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}" />
+ </java>
+ </target>
- <target name="run_standaloneclient2" 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="${simple.client2}">
- <jvmarg value="-Djava.naming.factory.initial=org.glassfish.jndi.cosnaming.CNCtxFactory" />
- <jvmarg value="-Djava.naming.provider.url=iiop://localhost:${orb.port}" />
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}" />
+ <target name="run_standaloneclient2" 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="${simple.client2}">
+ <jvmarg value="-Djava.naming.factory.initial=org.glassfish.jndi.cosnaming.CNCtxFactory" />
+ <jvmarg value="-Djava.naming.provider.url=iiop://localhost:${orb.port}" />
+ <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}" />
- </java>
- </target>
+ </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/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
index 9281d87..58f8fc6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
@@ -29,7 +29,7 @@
if (tb != null) {
return "hello";
}
-
+
return null;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
index 2b0dff8..8bb857b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
@@ -28,7 +28,7 @@
if (tb != null) {
return "hello";
}
-
+
return null;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.properties
index 982c344..0edb6e4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="cdi-singleton-hello"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="beans.xml" value="descriptor/beans.xml"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.xml
index ad8c001..641b3e8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Foo*.class,**/Test*.class,**/Singleton*.class,**/Hello*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java
index 0d08e93..5707529 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java
@@ -52,7 +52,7 @@
try {
hello.testError();
addStatus("Expected EJBException from Singleton.testError()", false);
-
+
throw new RuntimeException("Expected EJBException");
} catch (EJBException e) {
addStatus("Expected EJBException from Singleton.testError()", true);
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
index 70d8f4c..4008820 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
@@ -22,7 +22,7 @@
@EJB
Hello hello;
-
+
@jakarta.inject.Inject
TestBean tb;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
index 62b0702..4900457 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
@@ -34,7 +34,7 @@
@Inject
Foo foo;
-
+
@Inject
TestBean tb;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/WebTest.java
index 76b21c9..1f3a038 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebServlet");
WebTest webTest = new WebTest(args);
@@ -51,7 +51,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -61,7 +61,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -100,10 +100,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/smoke-tests/simple-managed-bean-interceptor-nonnull-package/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/build.properties
index a4d5078..e8a9f65 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/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-with-non-default-packages"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/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/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestAroundInvokeInterceptor.java
index 590431d..d5eeb7c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestAroundInvokeInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestAroundInvokeInterceptor.java
@@ -26,7 +26,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/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestManagedBean.java
index 0c93583..48b33fb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestManagedBean.java
@@ -16,7 +16,7 @@
package com.tests;
-//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/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestServlet.java
index ec38415..63ec98a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestServlet.java
@@ -72,5 +72,5 @@
else return "Interceptor invocation count" + count + " invalid";
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/WebTest.java
index 343d171..aeb016a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/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/smoke-tests/simple-managed-bean-interceptor/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/build.properties
index 4809e75..edd5da3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/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/smoke-tests/simple-managed-bean-interceptor/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/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/smoke-tests/simple-managed-bean-interceptor/servlet/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestAroundInvokeInterceptor.java
index 98ccd4c..5d2633d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestAroundInvokeInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestAroundInvokeInterceptor.java
@@ -24,7 +24,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/smoke-tests/simple-managed-bean-interceptor/servlet/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestManagedBean.java
index 2a36f10..8aaf100 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestManagedBean.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-//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/smoke-tests/simple-managed-bean-interceptor/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestServlet.java
index 63d89da..0d786ca 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestServlet.java
@@ -65,9 +65,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/smoke-tests/simple-managed-bean/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/WebTest.java
index ff40c2c..5f65cc7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/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/smoke-tests/simple-managed-bean/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/build.properties
index 712ba4a..db894b7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/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"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/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/smoke-tests/simple-managed-bean/servlet/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestManagedBean.java
index f3e57ae..83b3dfa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestManagedBean.java
@@ -14,13 +14,13 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-//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 {
TestBean tb;
boolean postConstructCalled = false;
-
+
public TestManagedBean(){}
@jakarta.inject.Inject //Constructor based Injection
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestServlet.java
index 8180c4f..c61ae7c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestServlet.java
@@ -54,5 +54,5 @@
if (tb != null && !tb.testInjection()) msg += info + "Bean Injection into ManagedBean failed";
return msg;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.properties
index d64848e..128dae6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="cdi-hello-mdb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="simple.client" value="com.sun.s1asdev.cdi.hello.mdb.client.Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="beans.xml" value="descriptor/beans.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.xml
index 2dd253c..088a503 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class,**/*Hello*" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -77,20 +77,20 @@
</target>
<target name="run_standaloneclient" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/jakarta.jms-api.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java
index 8167388..93aad65 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java
@@ -42,7 +42,7 @@
}
- @Resource(name="FooCF", mappedName="jms/cdi_hello_mdb_QCF")
+ @Resource(name="FooCF", mappedName="jms/cdi_hello_mdb_QCF")
private static QueueConnectionFactory queueConFactory;
@Resource(name="MsgBeanQueue", mappedName="jms/cdi_hello_mdb_InQueue")
@@ -59,7 +59,7 @@
private int numMessages = 2;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -68,15 +68,15 @@
public void doTest() {
try {
- if( queueConFactory == null ) {
+ if( queueConFactory == null ) {
- System.out.println("Java SE mode...");
- InitialContext ic = new InitialContext();
- queueConFactory = (jakarta.jms.QueueConnectionFactory) ic.lookup("jms/cdi_hello_mdb_QCF");
- msgBeanQueue = (jakarta.jms.Queue) ic.lookup("jms/cdi_hello_mdb_InQueue");
- clientQueue = (jakarta.jms.Queue) ic.lookup("jms/cdi_hello_mdb_OutQueue");
-
- }
+ System.out.println("Java SE mode...");
+ InitialContext ic = new InitialContext();
+ queueConFactory = (jakarta.jms.QueueConnectionFactory) ic.lookup("jms/cdi_hello_mdb_QCF");
+ msgBeanQueue = (jakarta.jms.Queue) ic.lookup("jms/cdi_hello_mdb_InQueue");
+ clientQueue = (jakarta.jms.Queue) ic.lookup("jms/cdi_hello_mdb_OutQueue");
+
+ }
setup();
doTest(numMessages);
@@ -90,14 +90,14 @@
}
public void setup() throws Exception {
-
+
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
queueReceiver = queueSession.createReceiver(clientQueue);
@@ -115,18 +115,18 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
- System.out.println("Sending message " + i + " to " + queue +
+ System.out.println("Sending message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
queueSender.send(queue, msg);
- System.out.println("Sent message " + i + " to " + queue +
+ System.out.println("Sent message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
}
}
- public void doTest(int num)
+ public void doTest(int num)
throws Exception {
Destination dest = msgBeanQueue;
@@ -140,7 +140,7 @@
System.out.println("Waiting for queue message");
Message recvdmessage = queueReceiver.receive(TIMEOUT);
if( recvdmessage != null ) {
- System.out.println("Received message : " +
+ System.out.println("Received message : " +
((TextMessage)recvdmessage).getText());
} else {
System.out.println("timeout after " + TIMEOUT + " seconds");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/Hello1.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/Hello1.java
index 55f1d9f..be61916 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/Hello1.java
@@ -19,5 +19,5 @@
public interface Hello1 {
public void hello(String s);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java
index 17709a9..e3f99b9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java
@@ -38,7 +38,7 @@
msg);
}
@PreDestroy public void myPreDestroyMethod() {
- System.out.println("PRE-DESTROY callback received in " + msg);
+ System.out.println("PRE-DESTROY callback received in " + msg);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java
index 6747648..47fd542 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java
@@ -21,7 +21,7 @@
// Hello1 interface is not annotated with @Local. If the
// bean only implements one interface it is assumed to be
// a local business interface.
-@Stateless(description="my stateless bean description")
+@Stateless(description="my stateless bean description")
public class HelloStateless implements Hello1 {
public void hello(String s) {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
index 6e9bac0..19dfb51 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
@@ -43,8 +43,8 @@
@EJB private Hello1 hello1;
@EJB private Hello2 hello2;
- @Resource(name="jms/MyQueueConnectionFactory",
- mappedName="jms/cdi_hello_mdb_QCF")
+ @Resource(name="jms/MyQueueConnectionFactory",
+ mappedName="jms/cdi_hello_mdb_QCF")
QueueConnectionFactory qcFactory;
@Resource(mappedName="jms/cdi_hello_mdb_OutQueue") Queue clientQueue;
@@ -57,7 +57,7 @@
QueueConnection connection = null;
try {
-
+
System.out.println("Calling hello1 stateless bean");
hello1.hello("local ejb3.0 stateless");
System.out.println("Calling hello2 stateful bean");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/TestBean.java
index 0dd4102..1fbc070 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/TestBean.java
@@ -18,6 +18,6 @@
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
public class TestBean
{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/WebTest.java
index 09cdfca..75da3da 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebServlet");
WebTest webTest = new WebTest(args);
@@ -51,7 +51,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -61,7 +61,7 @@
}
private void invoke() throws Exception {
-
+
Thread.sleep(2000); //WORKAROUND @XXX
String url = "http://" + host + ":" + port + contextRoot;
System.out.println("opening connection to " + url);
@@ -100,10 +100,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/smoke-tests/simple-wab-with-cdi/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.properties
index 38d97bd..0f8adf8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-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}-wab"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.xml
index a276cda..3ae62f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.xml
@@ -42,7 +42,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -50,23 +50,23 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-wab-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-wab-common"/>
</target>
-
+
<target name="run" depends="init-common">
<sleep seconds="25"/>
<java classname="WebTest">
@@ -79,10 +79,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/smoke-tests/simple-wab-with-cdi/common.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
index f342d87..92f55e4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
@@ -17,24 +17,24 @@
-->
<!--
- This is the top level build file that should be
- imported into all the leaf level build files
+ This is the top level build file that should be
+ imported into all the leaf level build files
-->
<!-- ================================================================ -->
<!-- Targets to clean class files and jars files -->
-<!--
-Variables used:
- ${build.classes.dir}
+<!--
+Variables used:
+ ${build.classes.dir}
${assemble.dir}
-->
<!-- ================================================================ -->
<target name="clean-classes-common" depends="init-common">
- <echo message="common.xml: Cleaning test source files: ${build.base.dir}"
+ <echo message="common.xml: Cleaning test source files: ${build.base.dir}"
level="verbose"/>
<delete dir="${build.base.dir}"/>
</target>
-
+
<target name="clean-jars-common" depends="init-common">
<delete dir="${assemble.dir}"/>
</target>
@@ -46,9 +46,9 @@
<!-- ================================================================ -->
<!-- Target to compile the java source files -->
-<!--
-Variables used:
- ${build.classes.dir}
+<!--
+Variables used:
+ ${build.classes.dir}
${s1astest.classpath}
${src}
-->
@@ -75,7 +75,7 @@
Variables Used:
${war.file}
${build.classes.dir}
- ${appname}
+ ${appname}
${assemble.dir}
${web.xml}
${beans.xml}
@@ -106,17 +106,17 @@
<target name="publish-war-common" depends="init-common">
<mkdir dir="${build.webapps.dir}"/>
- <copy file="${assemble.dir}/${appname}-web.war"
- tofile="${build.webapps.dir}/${appname}.war"
+ <copy file="${assemble.dir}/${appname}-web.war"
+ tofile="${build.webapps.dir}/${appname}.war"
overwrite="true" />
</target>
<target name="clean-webapps-common" depends="init-common">
- <delete dir="${build.webapps.dir}" quiet="true" />
+ <delete dir="${build.webapps.dir}" quiet="true" />
</target>
<target name="clear">
- <delete file="${war.file}"/>
+ <delete file="${war.file}"/>
</target>
<target name="copy-tlds" if="tlds-exist" depends="clear,test-tlds-exist">
@@ -145,13 +145,13 @@
<mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF/lib"/>
<mkdir dir="lib"/>
- <copy file="${glassfish-web.xml}"
+ <copy file="${glassfish-web.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/glassfish-web.xml" failonerror="false"/>
- <copy file="${sun-web.xml}"
+ <copy file="${sun-web.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/sun-web.xml" failonerror="false"/>
- <copy file="${weblogic.xml}"
+ <copy file="${weblogic.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/weblogic.xml" failonerror="false"/>
- <copy file="${glassfish-resources.xml}"
+ <copy file="${glassfish-resources.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/glassfish-resources.xml" failonerror="false"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF/lib" failonerror="false">
<fileset dir="lib">
@@ -159,32 +159,32 @@
<include name="**/*.zip"/>
</fileset>
</copy>
- <copy file="${webservices.xml}"
+ <copy file="${webservices.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/webservices.xml"
failonerror="false"/>
- <copy file="${mappingfile.location}/${mappingfile.name}"
+ <copy file="${mappingfile.location}/${mappingfile.name}"
tofile="${build.classes.dir}/tmp/${mappingfile.name}"
failonerror="false"/>
- <copy file="${wsdlfile.location}/${wsdlfile.name}"
+ <copy file="${wsdlfile.location}/${wsdlfile.name}"
tofile="${build.classes.dir}/tmp/WEB-INF/wsdl/${wsdlfile.name}"
failonerror="false"/>
- <copy file="${tagPlugins.xml}"
+ <copy file="${tagPlugins.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/tagPlugins.xml"
failonerror="false"/>
- <copy file="${web.xml}"
+ <copy file="${web.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/web.xml"
failonerror="false"/>
- <copy file="${persistence.xml}"
+ <copy file="${persistence.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/persistence.xml"
failonerror="false"/>
- <copy file="${beans.xml}"
+ <copy file="${beans.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/beans.xml"
failonerror="false"/>
<copy file="${context.xml}"
tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
<copy file="${cdi-extension.service}"
tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension" failonerror="false"/>
-
+
<copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
<fileset dir="${war.classes}">
<include name="**/*.class"/>
@@ -229,10 +229,10 @@
<include name="WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
<include name="WEB-INF/classes/META-INF/persistence.xml"/>
</fileset>
- </jar>
+ </jar>
<echo message="created war file ${war.file}" level="verbose"/>
- <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
- <echo message="my webclient war classes are:${webclient.war.classes}"
+ <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
+ <echo message="my webclient war classes are:${webclient.war.classes}"
level="verbose"/>
</target>
@@ -244,13 +244,13 @@
<mkdir dir="${build.classes.dir}/tmp/WEB-INF/lib"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF/META-INF"/>
<mkdir dir="lib"/>
- <copy file="${glassfish-web.xml}"
+ <copy file="${glassfish-web.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/glassfish-web.xml" failonerror="false"/>
- <copy file="${sun-web.xml}"
+ <copy file="${sun-web.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/sun-web.xml" failonerror="false"/>
- <copy file="${weblogic.xml}"
+ <copy file="${weblogic.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/weblogic.xml" failonerror="false"/>
- <copy file="${glassfish-resources.xml}"
+ <copy file="${glassfish-resources.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/glassfish-resources.xml" failonerror="false"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF/lib" failonerror="false">
<fileset dir="lib">
@@ -258,36 +258,36 @@
<include name="**/*.zip"/>
</fileset>
</copy>
- <copy file="${webservices.xml}"
+ <copy file="${webservices.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/webservices.xml"
failonerror="false"/>
- <copy file="${mappingfile.location}/${mappingfile.name}"
+ <copy file="${mappingfile.location}/${mappingfile.name}"
tofile="${build.classes.dir}/tmp/${mappingfile.name}"
failonerror="false"/>
- <copy file="${wsdlfile.location}/${wsdlfile.name}"
+ <copy file="${wsdlfile.location}/${wsdlfile.name}"
tofile="${build.classes.dir}/tmp/WEB-INF/wsdl/${wsdlfile.name}"
failonerror="false"/>
- <copy file="${tagPlugins.xml}"
+ <copy file="${tagPlugins.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/tagPlugins.xml"
failonerror="false"/>
- <copy file="${web.xml}"
+ <copy file="${web.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/web.xml"
failonerror="false"/>
- <copy file="${persistence.xml}"
+ <copy file="${persistence.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/persistence.xml"
failonerror="false"/>
- <copy file="${beans.xml}"
+ <copy file="${beans.xml}"
tofile="${build.classes.dir}/tmp/WEB-INF/beans.xml"
failonerror="false"/>
- <copy file="${bundle.descriptor}"
+ <copy file="${bundle.descriptor}"
tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/MANIFEST.MF"
failonerror="false"/>
<copy file="${context.xml}"
tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
<copy file="${cdi-extension.service}"
tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension" failonerror="false"/>
-
+
<copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
<fileset dir="${war.classes}">
<include name="**/*.class"/>
@@ -332,10 +332,10 @@
<include name="WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
<include name="WEB-INF/classes/META-INF/persistence.xml"/>
</fileset>
- </jar>
+ </jar>
<echo message="created WAB file ${war.file}" level="verbose"/>
- <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
- <echo message="my webclient WAB classes are:${webclient.war.classes}"
+ <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
+ <echo message="my webclient WAB classes are:${webclient.war.classes}"
level="verbose"/>
</target>
@@ -354,35 +354,35 @@
Variables Used:
${ejb.jar}
${build.classes.dir}
- ${ejb-jar.xml}
+ ${ejb-jar.xml}
${beans.xml}
- ${persistence-orm.xml}
- ${sun-ejb-jar.xml}
- ${glassfish-ejb-jar.xml}
- ${sun-cmp-mappings.xml}
- ${metainf.dir}
+ ${persistence-orm.xml}
+ ${sun-ejb-jar.xml}
+ ${glassfish-ejb-jar.xml}
+ ${sun-cmp-mappings.xml}
+ ${metainf.dir}
${ejbjar.files}
${dbschema}
-->
<!-- ================================================================ -->
<target name="package-ejbjar-common">
<delete file="${ejb.jar}"/>
- <echo message="common.xml: Generating ejb-jar inside build directory"
+ <echo message="common.xml: Generating ejb-jar inside build directory"
level="verbose"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${ejb-jar.xml}"
+ <copy file="${ejb-jar.xml}"
tofile="${build.classes.dir}/META-INF/ejb-jar.xml"
failonerror="false"/>
- <copy file="${persistence-orm.xml}"
+ <copy file="${persistence-orm.xml}"
tofile="${build.classes.dir}/META-INF/persistence-orm.xml"
failonerror="false"/>
- <copy file="${webservices.xml}"
+ <copy file="${webservices.xml}"
tofile="${build.classes.dir}/META-INF/webservices.xml"
failonerror="false"/>
- <copy file="${sun-ejb-jar.xml}"
+ <copy file="${sun-ejb-jar.xml}"
tofile="${build.classes.dir}/META-INF/sun-ejb-jar.xml"
failonerror="false"/>
- <copy file="${glassfish-ejb-jar.xml}"
+ <copy file="${glassfish-ejb-jar.xml}"
tofile="${build.classes.dir}/META-INF/glassfish-ejb-jar.xml"
failonerror="false"/>
<copy file="${glassfish-resources.xml}"
@@ -407,42 +407,42 @@
<include name="sun-cmp-mappings.xml"/>
<include name="beans.xml"/>
</metainf>
- </jar>
+ </jar>
<delete dir="${build.classes.dir}/META-INF" failonerror="false"/>
<delete file="${build.classes.dir}/*.dbschema" failonerror="false"/>
-</target>
+</target>
<!-- ================================================================ -->
<!-- Target to package the appclient application to jar file -->
<!--
Variables Used:
${appclient.jar}
- ${appclientjar.classes}
- ${appclientjar.files}
+ ${appclientjar.classes}
+ ${appclientjar.files}
${build.classes.dir}
- ${application-client.xml}
- ${sun-application-client.xml}
+ ${application-client.xml}
+ ${sun-application-client.xml}
-->
<!-- ================================================================ -->
<target name="package-appclientjar-common">
<delete file="${appclient.jar}"/>
- <echo message="common.xml: Generating appclient-jar inside build directory"
+ <echo message="common.xml: Generating appclient-jar inside build directory"
level="verbose"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
<copy file="${application-client.xml}"
- tofile="${build.classes.dir}/META-INF/application-client.xml"
+ tofile="${build.classes.dir}/META-INF/application-client.xml"
failonerror="false"/>
<copy file="${sun-application-client.xml}" tofile="${build.classes.dir}/META-INF/sun-application-client.xml"
failonerror="false"/>
- <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
- update="true" includes ="${appclientjar.classes}"
- manifest="./client/MANIFEST.MF">
+ <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
+ update="true" includes ="${appclientjar.classes}"
+ manifest="./client/MANIFEST.MF">
<metainf dir="${build.classes.dir}/META-INF">
<include name="application-client.xml"/>
<include name="sun-application-client.xml"/>
</metainf>
- </jar>
-</target>
+ </jar>
+</target>
<!-- ================================================================ -->
<!-- Target to create the ejb application jar file -->
@@ -453,7 +453,7 @@
<param name="ejbjar.files" value="${build.classes.dir}"/>
<param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
</antcall>
-</target>
+</target>
<!-- ================================================================ -->
<!-- Target to create the appclient jar file -->
@@ -461,9 +461,9 @@
<target name="appclient-jar-common" depends="init-common">
<mkdir dir="${assemble.dir}"/>
<antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
+ <param name="appclientjar.files"
value="${build.classes.dir}"/>
- <param name="appclient.jar"
+ <param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
</antcall>
</target>
@@ -492,22 +492,22 @@
<target name="build-ear-common" depends="fixFiles,package-persistence-common,ejb-jar-common,appclient-jar-common,webclient-war-common">
<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="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <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="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
<copy file="${glassfish-resources-ear.xml}" tofile="${build.classes.dir}/META-INF/glassfish-resources.xml" failonerror="false" filtering="true"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
<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/application.xml"/>
+ <include name="META-INF/sun-application.xml"/>
+ <include name="META-INF/application.xml"/>
<include name="META-INF/glassfish-resources.xml"/>
</fileset>
<fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
- </jar>
+ </jar>
</target>
@@ -517,21 +517,21 @@
<target name="ear-common" depends="fixFiles,init-common">
<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"/>
+ <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"
+ <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/sun-application.xml"/>
<include name="META-INF/glassfish-resources.xml"/>
</fileset>
<fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
- </ear>
+ </ear>
</target>
@@ -561,17 +561,17 @@
<echo message="Operand ${operand.props}" level="verbose"/>
<echo message="asadmin ${admin.command} ${as.props} ${operand.props}"/>
<exec executable="${ASADMIN}" failonerror="true">
- <arg line="${admin.command} ${as.props} ${operand.props}" />
+ <arg line="${admin.command} ${as.props} ${operand.props}" />
</exec>
</target>
<target name="asadmin-common-ignore-fail">
- <echo message="Doing admin task ${admin.command} (ignore failures)"
+ <echo message="Doing admin task ${admin.command} (ignore failures)"
level="verbose"/>
<echo message="Operand ${operand.props}" level="verbose"/>
<echo message="asadmin ${admin.command} ${as.props} ${operand.props}"/>
<exec executable="${ASADMIN}" failonerror="false">
- <arg line="${admin.command} ${as.props} ${operand.props}" />
+ <arg line="${admin.command} ${as.props} ${operand.props}" />
</exec>
</target>
@@ -579,7 +579,7 @@
<!-- Target to execute a batchfile of asadmin commands -->
<!-- ================================================================ -->
<target name="asadmin-batch-common">
- <echo message="Doing admin batch task ${admin.command} --file"
+ <echo message="Doing admin batch task ${admin.command} --file"
level="verbose"/>
<property name="user.password.file" value="asadminuserpassword.txt"/>
<echo file="${user.password.file}" append="false">
@@ -590,11 +590,11 @@
</echo>
<exec executable="${ASADMIN}" failonerror="true">
<arg line="--user ${admin.user} --passwordfile ${user.password.file} --host ${admin.host} --port ${admin.port} --echo=true --terse=true"/>
- <arg line="multimode --file ${asadmin.file}" />
+ <arg line="multimode --file ${asadmin.file}" />
</exec>
<delete file="${user.password.file}" failonerror="false"/>
</target>
-
+
<!-- ================================================================ -->
<!-- ================================================================ -->
@@ -618,7 +618,7 @@
</exec>
<delete file="${user.password.file}" failonerror="false"/>
</target>
-
+
<!-- ================================================================ -->
<!-- Target to delete the user in file realm the AppServ -->
<!-- ================================================================ -->
@@ -634,7 +634,7 @@
</target>
<!-- ================================================================ -->
-<!-- J2EE Connector related targets -->
+<!-- J2EE Connector related targets -->
<!-- ================================================================ -->
<target name="create-connector-connpool-common"
@@ -721,7 +721,7 @@
<!-- Target to create JDBC connection pool -->
<!-- ================================================================ -->
<target name="create-jdbc-connpool-common" depends="init-common">
-<echo message="created jdbc connection pool ${jdbc.conpool.name}"
+<echo message="created jdbc connection pool ${jdbc.conpool.name}"
level="verbose"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="create-jdbc-connection-pool"/>
@@ -735,7 +735,7 @@
</target>
<target name="create-jdbc-driver-connpool-common" depends="init-common">
-<echo message="created jdbc connection pool ${jdbc.conpool.name}"
+<echo message="created jdbc connection pool ${jdbc.conpool.name}"
level="verbose"/>
<property name="extra-params" value=""/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -772,7 +772,7 @@
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.URL=${db.url};user=${db.user};password=${db.pwd}"/>
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.URL=${db.url};user=${db.user};password=${db.pwd}"/>
</antcall>
</target>
@@ -823,7 +823,7 @@
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.URL=${db.url};user=${db.user};password=${db.pwd}"/>
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.URL=${db.url};user=${db.user};password=${db.pwd}"/>
</antcall>
</target>
@@ -839,14 +839,14 @@
<arg line="--target ${appserver.instance.name}"/>
<arg line="${jdbc.conpool.name}"/>
</exec>
- <echo message="cmd executed for ${appserver.instance.name}"/>
+ <echo message="cmd executed for ${appserver.instance.name}"/>
</target>
<!-- ================================================================ -->
<!-- Target to create JDBC resource -->
<!-- ================================================================ -->
<target name="create-jdbc-resource-common" depends="init-common">
-<echo message="Creating jdbc resource pool ${jdbc.resource.name}"
+<echo message="Creating jdbc resource pool ${jdbc.resource.name}"
level="verbose"/>
<echo message="asadmin create-jdbc-resource ${as.props} --connectionpoolid ${jdbc.conpool.name} --target ${appserver.instance.name} ${jdbc.resource.name}"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -898,7 +898,7 @@
<!-- Target to create persistence resource -->
<!-- ================================================================ -->
<target name="create-persistence-resource-common" depends="init-common">
-<echo message="Creating pm resource at ${pm.resource.name}"
+<echo message="Creating pm resource at ${pm.resource.name}"
level="verbose"/>
<echo message="asadmin create-persistence-resource ${as.props} --target ${appserver.instance.name} ${pm.resource.name}"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -908,7 +908,7 @@
<arg line="--target ${appserver.instance.name}"/>
<arg line="${pm.resource.name}"/>
</exec>
- <echo message="Created ${pm.resource.name} --target ${appserver.instance.name}"/>
+ <echo message="Created ${pm.resource.name} --target ${appserver.instance.name}"/>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
<param name="operand.props"
@@ -927,14 +927,14 @@
<target name="delete-persistence-resource-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="delete-persistence-resource
+ value="delete-persistence-resource
--target ${appserver.instance.name}" />
<param name="operand.props" value="${pm.resource.name}" />
</antcall>
</target>
<target name="execute-sql-common" depends="init-common">
-<echo message="Executing sql statement at ${basedir} from ${sql.file}"
+<echo message="Executing sql statement at ${basedir} from ${sql.file}"
level="verbose"/>
<sql
driver="${db.driver}"
@@ -949,7 +949,7 @@
<target name="execute-ejb-sql-common" depends="init-common">
-<echo message="Executing sql statement at ${basedir} from ${sql.file}"
+<echo message="Executing sql statement at ${basedir} from ${sql.file}"
level="verbose"/>
<sql
driver="${db.driver}"
@@ -965,8 +965,8 @@
<!-- ================================================================ -->
<!-- Target to create/delete javamail resources -->
-<!--
- Properties required:
+<!--
+ Properties required:
mailhost
fromaddress
debug
@@ -1007,7 +1007,7 @@
<!-- Target to create database table through SQL file -->
<!-- ================================================================ -->
<target name="create-sql-common" depends="init-common">
-<echo message="creating tables from ${basedir}/sql/${db.create}"
+<echo message="creating tables from ${basedir}/sql/${db.create}"
level="verbose"/>
<sql
driver="${db.driver}"
@@ -1026,7 +1026,7 @@
<!-- Target to delete database table through SQL file -->
<!-- ================================================================ -->
<target name="delete-sql-common" depends="init-common">
-<echo message="dropping tables from ${basedir}/sql/${db.drop}"
+<echo message="dropping tables from ${basedir}/sql/${db.drop}"
level="verbose"/>
<sql
driver="${db.driver}"
@@ -1045,11 +1045,11 @@
<!-- Taget to create JMS Connection -->
<!-- ======================================================= -->
<target name="create-jms-connection-common" depends="init-common">
- <echo message="Creating JMS connection factory with name ${jms.factory.name}"
+ <echo message="Creating JMS connection factory with name ${jms.factory.name}"
level="verbose"/>
<exec executable="${ASADMIN}">
<arg line="create-jms-resource "/>
- <arg line="--restype ${jms.factory.type}"/>
+ <arg line="--restype ${jms.factory.type}"/>
<arg line="${as.props}"/>
<arg line="--target ${appserver.instance.name}"/>
<arg line="${jms.factory.name}" />
@@ -1060,23 +1060,23 @@
<!-- Taget to delete JMS Connection -->
<!-- ======================================================= -->
<target name="delete-jms-connection-common" depends="init-common">
- <echo message="Delete JMS connection factory with name ${jms.factory.name}"
+ <echo message="Delete JMS connection factory with name ${jms.factory.name}"
level="verbose"/>
<exec executable="${ASADMIN}">
- <arg line="delete-jms-resource "/>
+ <arg line="delete-jms-resource "/>
<arg line="${as.props}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${jms.factory.name}"/>
</exec>
</target>
<!-- JMS: create/delete Destination Resource Targets -->
<target name="create-jms-resource-common" depends="init-common">
- <echo message="Creating JMS resource with name ${jms.resource.name}"
+ <echo message="Creating JMS resource with name ${jms.resource.name}"
level="verbose"/>
<exec executable="${ASADMIN}">
- <arg line="create-jmsdest --desttype ${dest.type} "/>
+ <arg line="create-jmsdest --desttype ${dest.type} "/>
<arg line="${as.props}"/>
<arg line="${dest.name}"/>
</exec>
@@ -1085,24 +1085,24 @@
<arg line="create-jms-resource "/>
<arg line="--restype ${jms.resource.type}"/>
<arg line="--property imqDestinationName=${dest.name}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${as.props}"/>
<arg line="${jms.resource.name}"/>
</exec>
</target>
<target name="delete-jms-resource-common" depends="init-common">
- <echo message="Delete JMS resource with name ${jms.resource.name}"
+ <echo message="Delete JMS resource with name ${jms.resource.name}"
level="verbose"/>
<exec executable="${ASADMIN}">
<arg line="delete-jms-resource "/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${as.props} ${jms.resource.name}"/>
</exec>
<exec executable="${ASADMIN}">
- <arg line="delete-jmsdest --desttype ${dest.type} "/>
+ <arg line="delete-jmsdest --desttype ${dest.type} "/>
<arg line="${as.props} ${dest.name}"/>
</exec>
</target>
@@ -1146,20 +1146,20 @@
<target name="deploy-common" depends="init-common">
<antcall target="deploy-common-pe"/>
<antcall target="deploy-common-ee"/>
-</target>
+</target>
<target name="deploy-verify-common" depends="init-common">
<antcall target="deploy-verify-common-pe"/>
<antcall target="deploy-verify-common-ee"/>
-</target>
+</target>
<target name="deploy-common-pe" depends="init-common" unless="ee">
<property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
<property name="extra-params" value=""/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
- <arg line="${as.props}"/>
- <arg line="${extra-params}"/>
+ <arg line="${as.props}"/>
+ <arg line="${extra-params}"/>
<arg line="--target ${appserver.instance.name}"/>
<arg line="--retrieve ${assemble.dir}"/>
<arg line="--libraries ${libraries}"/>
@@ -1169,7 +1169,7 @@
<echo message="Deployment on target server ${appserver.instance.name} successful"/>
</target>
-<target name="deploy-common-ee" depends="init-common" if="ee">
+<target name="deploy-common-ee" depends="init-common" if="ee">
<echo message="Deploying in EE..."/>
<property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -1221,9 +1221,9 @@
<arg line="--precompilejsp=${precompilejsp}"/>
<arg line="--upload true"/>
<arg line="--retrieve ${assemble.dir}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
</exec>
-</target>
+</target>
<target name="deploy-war-name" depends="init-common">
<echo message="Deploying ${warname} from ${basedir}."
@@ -1253,7 +1253,7 @@
</target>
<target name="deploy-wab-commonpe" depends="init-common" unless="ee">
- <echo message="Deploying WAB ${assemble.dir}/${appname}-web.war from ${basedir}."
+ <echo message="Deploying WAB ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
<property name="precompilejsp" value="true"/>
<property name="force" value="false"/>
@@ -1263,17 +1263,17 @@
<arg line="--precompilejsp=${precompilejsp}"/>
<arg line="--force=${force}"/>
<arg line="--upload=true"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="--libraries ${libraries}"/>
<arg line="--type=osgi"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
-</target>
+</target>
<target name="deploy-war-commonpe" depends="init-common" unless="ee">
- <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
+ <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
<property name="precompilejsp" value="true"/>
<property name="force" value="false"/>
@@ -1284,11 +1284,11 @@
<arg line="--precompilejsp=${precompilejsp}"/>
<arg line="--force=${force}"/>
<arg line="--upload=true"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="--libraries ${libraries}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
-</target>
+</target>
<target name="deploy-war-commonee" if="ee">
<property name="precompilejsp" value="true"/>
@@ -1301,7 +1301,7 @@
<arg line="--precompilejsp=${precompilejsp}"/>
<arg line="--force=${force}"/>
<arg line="--upload=true"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="--libraries ${libraries}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
@@ -1351,10 +1351,10 @@
<arg line="deploy"/>
<arg line="${as.props}"/>
<arg line="--upload=true"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-ejb.jar"/>
</exec>
-</target>
+</target>
<!-- deploy the standalone jar in AppServ -->
<target name="deploy-client-common" depends="init-common">
@@ -1362,11 +1362,11 @@
<arg line="deploy"/>
<arg line="${as.props}"/>
<arg line="--upload=true"/>
- <arg line="--retrieve ${assemble.dir}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--retrieve ${assemble.dir}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-client.jar"/>
</exec>
-</target>
+</target>
<target name="undeploy-war-name" depends="init-common">
<property name="deployedapp.name" value="${warname}"/>
@@ -1388,27 +1388,27 @@
<exec executable="${ASADMIN}" failonerror="false">
<arg line="undeploy"/>
<arg line="${as.props}"/>
-<!--
-<arg line=type ${apptype}/>
+<!--
+<arg line=type ${apptype}/>
-->
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${extra-params}"/>
<!-- deployedapp.name defaults to {appname}App.declared in properties.xml-->
- <arg line="${deployedapp.name}"/>
+ <arg line="${deployedapp.name}"/>
</exec>
</target>
<!-- undeploy the standalone war in AppServ -->
<target name="undeploy-war-common" depends="init-common">
- <echo message="Undeploying warfile ${appname}-web from
+ <echo message="Undeploying warfile ${appname}-web from
${assemble.dir}/${appname}-web.war from ${basedir}." level="verbose"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="undeploy"/>
<arg line="${as.props}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${appname}-web"/>
</exec>
-</target>
+</target>
<!-- undeploy the standalone war in AppServ -->
@@ -1416,7 +1416,7 @@
<exec executable="${ASADMIN}" failonerror="false">
<arg line="undeploy"/>
<arg line="${as.props}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${appname}-ejb"/>
</exec>
</target>
@@ -1426,10 +1426,10 @@
<exec executable="${ASADMIN}" failonerror="false">
<arg line="undeploy"/>
<arg line="${as.props}"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${appname}-client"/>
</exec>
-</target>
+</target>
<!-- run appclient in AppServ -->
@@ -1472,11 +1472,11 @@
<arg value="${testsuite.id}"/>
</java>
</target>
-
+
<!-- prepare Pointbase servers -->
<target name="preparePB" depends="init-common">
<echo message="Starting Pointbase servers" level="verbose"/>
- <copy file="${env.APS_HOME}/lib/pointbase.ini"
+ <copy file="${env.APS_HOME}/lib/pointbase.ini"
tofile="${db.dir}/pointbase.ini"/>
<replace file="${db.dir}/pointbase.ini" token="@@@" value="${db.dir}"/>
</target>
@@ -1499,12 +1499,12 @@
<!-- target name="startPB" depends="preparePB">
<parallel>
- <java classname="com.pointbase.net.netServer"
+ <java classname="com.pointbase.net.netServer"
classpath="${db.classpath}" failonerror="false" fork="true">
<arg line="/port:9092"/>
<arg line="/pointbase.ini=${db.dir}/pointbase.ini"/>
</java>
- <java classname="com.pointbase.net.netServer"
+ <java classname="com.pointbase.net.netServer"
classpath="${db.classpath}" failonerror="true" fork="true">
<arg line="/port:9093"/>
<arg line="/pointbase.ini=${db.dir}/pointbase.ini"/>
@@ -1515,7 +1515,7 @@
<!-- start Derby Database -->
<target name="startDerby">
<condition property="darwin">
- <os name="Mac OS X"/>
+ <os name="Mac OS X"/>
</condition>
<antcall target="startDerbyNonMac"/>
<antcall target="startDerbyMac"/>
@@ -1532,7 +1532,7 @@
classpath="${db.classpath}" fork="true" spawn="true">
<arg line="-h localhost -p 1528 start"/>
</java>
- </parallel>
+ </parallel>
</target>
<target name="startDerbyMac" depends="init-common" if="darwin">
@@ -1545,7 +1545,7 @@
</java>
<java classname="org.apache.derby.drda.NetworkServerControl"
classpath="${db.classpath}" fork="true" spawn="true">
- <sysproperty key="derby.storage.fileSyncTransactionLog" value="true"/>
+ <sysproperty key="derby.storage.fileSyncTransactionLog" value="true"/>
<arg line="-h localhost -p 1528 start"/>
</java>
</parallel>
@@ -1573,10 +1573,10 @@
<!-- setup IMQ for RI Build -->
<target name="setup-mq-common" depends="init-common">
- <echo message="Executing Datastore setup for S1MQ. Required only for RI"
+ <echo message="Executing Datastore setup for S1MQ. Required only for RI"
level="verbose"/>
- <echo message="${IMQDBMGR} -javahome ${java.home}
- -b ${admin.domain}_${appserver.instance.name} create all"
+ <echo message="${IMQDBMGR} -javahome ${java.home}
+ -b ${admin.domain}_${appserver.instance.name} create all"
level="verbose"/>
<exec executable="${IMQDBMGR}" failonerror="true">
<arg line="-javahome ${java.home} -b ${admin.domain}_${appserver.instance.name} create all" />
@@ -1637,13 +1637,13 @@
<!-- usage -->
<target name="usage-common">
- <echo>
+ <echo>
ant clean Remove all classes files
ant build Build the application
ant deploy Deploy the ear files to S1AS
- ant run Run the application
+ ant run Run the application
ant undeploy Undeploy the ear files from S1AS
- ant usage Display this message
+ ant usage Display this message
</echo>
</target>
@@ -1669,13 +1669,13 @@
<target name="restart-instance">
<echo message="Restarting remote server instance,until this gets fixed"/>
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="false">
<arg line="stop-instance"/>
<arg line="${as.props}"/>
<arg line="${appserver.instance.name}"/>
</exec>
<sleep seconds="30"/>
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="false">
<arg line="start-instance"/>
<arg line="${as.props}"/>
<arg line="${appserver.instance.name}"/>
@@ -1698,7 +1698,7 @@
</target>
<target name="setupTimer" depends="init-common" if="ee">
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="false">
<arg line="create-resource-ref"/>
<arg line="${as.props}"/>
<arg line="--target server"/>
@@ -1725,13 +1725,13 @@
</target>
<target name="unsetupTimer" depends="init-common" if="ee">
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="false">
<arg line="delete-resource-ref"/>
<arg line="${as.props}"/>
<arg line="--target server"/>
<arg line="${jdbc.resource.name}"/>
</exec>
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="false">
<arg line="unset"/>
<arg line="${appserver.instance.name}-config.ejb-container.ejb-timer-service.timer-datasource"/>
</exec>
@@ -1924,7 +1924,7 @@
<!-- Target to Flush connection pool -->
<!-- ================================================================ -->
<target name="flush-connpool-common" depends="init-common">
-<echo message="Flush connection pool ${jdbc.conpool.name}"
+<echo message="Flush connection pool ${jdbc.conpool.name}"
level="verbose"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="flush-connection-pool"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestBean.java
index fad6896..9bcc84e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestBean.java
@@ -16,7 +16,7 @@
package tests.cdi;
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
//This bean implements Serializable as it needs to be placed into a Stateful Bean
public class TestBean
{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
index 177f830..6d5527d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
@@ -51,7 +51,7 @@
msg += "BeanManager Injection via component environment lookup failed";
}
if (bm1 == null) msg += "BeanManager Injection via component environment lookup failed";
-
+
System.out.println("BeanManager is " + bm);
System.out.println("BeanManager via lookup is " + bm1);
writer.write(msg + "\n");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.properties
index 982c344..0edb6e4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="cdi-singleton-hello"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="beans.xml" value="descriptor/beans.xml"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.xml
index d29250d..85beda9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="com/acme/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
index 933edbb..32af701 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
@@ -31,17 +31,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -49,37 +49,37 @@
public void doTest() {
- try {
+ try {
- // Ensure that MEJB is registered under all three of its JNDI names
- System.out.println("Looking up MEJB Homes");
- ManagementHome mh1Obj = (ManagementHome) new InitialContext().lookup("ejb/mgmt/MEJB");
- ManagementHome mh2Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
- ManagementHome mh3Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean!javax.management.j2ee.ManagementHome");
+ // Ensure that MEJB is registered under all three of its JNDI names
+ System.out.println("Looking up MEJB Homes");
+ ManagementHome mh1Obj = (ManagementHome) new InitialContext().lookup("ejb/mgmt/MEJB");
+ ManagementHome mh2Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
+ ManagementHome mh3Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean!javax.management.j2ee.ManagementHome");
addStatus("mejb relative lookup", (mh1Obj != null));
addStatus("mejb global lookup", (mh2Obj != null));
addStatus("mejb global lookup with explicit ManagedHome interface", (mh3Obj != null));
- Hello hello = (Hello) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+ Hello hello = (Hello) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
String response = hello.hello();
addStatus("Singleton bean response", response.equals("hello, world!\n"));
- try {
- hello.testError();
+ try {
+ hello.testError();
addStatus("Expected EJBException from Singleton.testError()", false);
- throw new RuntimeException("Expected EJBException");
- } catch(EJBException e) {
+ throw new RuntimeException("Expected EJBException");
+ } catch(EJBException e) {
addStatus("Expected EJBException from Singleton.testError()", true);
- }
+ }
String injectionStatus = hello.testInjection();
System.out.println("Injection tests in server response"+ injectionStatus);
addStatus("Testing Injection in EJB Singleton" , injectionStatus.trim().equals(""));
- } catch(Exception e) {
- stat.addStatus("local main", stat.DID_NOT_RUN);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.DID_NOT_RUN);
+ e.printStackTrace();
+ }
}
private void addStatus(String message, boolean result){
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
index 4546976..35a9d27 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
@@ -22,7 +22,7 @@
@EJB Hello hello;
@jakarta.inject.Inject TestBean tb;
-
+
public boolean testInjection(){
return tb != null;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
index a754fec..2d19166 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
@@ -37,9 +37,9 @@
Foo foo;
@Inject
TestBean tb;
-
+
Bar b;
-
+
@Inject
public SingletonBean(Bar b){
this.b = b;
@@ -71,7 +71,7 @@
if (!foo.testInjection())
return "testInjection in Foo failed";
if (b == null)
- return "Constructor Injection of bean failed";
+ return "Constructor Injection of bean failed";
return "";
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/WebTest.java
index 511806f..0bca2c0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebServlet");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
System.out.println("opening connection to " + url);
@@ -99,11 +99,11 @@
if (isExpectedResponse(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: org.jboss.logging.JDKLogger and org.jboss.logging.jboss-logging in output" +
+ System.out.println("Wrong response. Expected: org.jboss.logging.JDKLogger and org.jboss.logging.jboss-logging in output" +
", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
private boolean isExpectedResponse(String line) {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/build.properties
index 14467fd..c9a9ddc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/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}-slf4j-visibility"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/build.xml
index 83ad666..0691212 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/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/smoke-tests/slf4j-visibility/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestBean.java
index 6d059e2..c436395 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestBean.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
//This bean implements Serializable as it needs to be placed into a Stateful Bean
public class TestBean
{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java
index ffc409b..31ec3b0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java
@@ -52,15 +52,15 @@
}
if (bm1 == null) msg += "BeanManager Injection via component environment lookup failed";
-
+
System.out.println("BeanManager is " + bm);
System.out.println("BeanManager via lookup is " + bm1);
-
+
Logger l = Logger.getLogger(getClass());
String s = "[ Hello World is logged by an instance of " + l.getClass() + ", which is loaded by " + l.getClass().getClassLoader() + "]";
msg += s;
l.info(s);
-
+
writer.write(msg + "\n");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/build.properties b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/build.properties
index 8250682..24e4761 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/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}-specialization-leak-alternatives"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/build.xml b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/specialization/alternative-leaks/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/descriptor/beans.xml
index 1cd96c3..1f24f15 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/descriptor/beans.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/descriptor/beans.xml
@@ -29,5 +29,5 @@
<alternatives>
<stereotype>test.beans.artifacts.MockStereotype</stereotype>
</alternatives>
-
+
</beans>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
index 1be5d11..3968912 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
@@ -30,10 +30,10 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("RequiresNewTransactionInterceptor::AroundInvoke");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/TransactionInterceptor.java
index 89b743a..f5da14c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/TransactionInterceptor.java
@@ -29,15 +29,15 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/mock/MockShoppingCart.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/mock/MockShoppingCart.java
index fd60138..6d97dc7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/mock/MockShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/mock/MockShoppingCart.java
@@ -27,11 +27,11 @@
public class MockShoppingCart extends ShoppingCart{
public static boolean mockShoppingCartInvoked = false;
-
+
public void addItem(String s) {
mockShoppingCartInvoked = true;
System.out.println("MockShoppingCart::addItem called");
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/nonmock/ShoppingCart.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/nonmock/ShoppingCart.java
index 5408758..dff6e31 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/nonmock/ShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/nonmock/ShoppingCart.java
@@ -28,7 +28,7 @@
public void addItem(String s) {
shoppingCartInvoked = true;
System.out.println("ShoppingCart::addItem called");
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/servlet/LeakQualifierTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/servlet/LeakQualifierTestServlet.java
index 519299e..1bfadad 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/servlet/LeakQualifierTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/servlet/LeakQualifierTestServlet.java
@@ -42,11 +42,11 @@
@Inject
@Preferred
TestBeanInterface tb;
-
+
@Inject
@LeakQualifier
TestBeanInterface tb_leak;
-
+
@Inject
@Preferred
ShoppingCart sc;
@@ -73,19 +73,19 @@
+ TransactionInterceptor.aroundInvokeInvocationCount;
if (!TransactionInterceptor.errorMessage.trim().equals(""))
msg += TransactionInterceptor.errorMessage;
-
+
if (RequiresNewTransactionInterceptor.aroundInvokeCalled)
msg += "RequiresNew TransactionInterceptor called when " +
- "it shouldn't have been called";
-
+ "it shouldn't have been called";
+
//test that the mocks are called instead of the actual beans
if (TestBean.testBeanInvoked)
msg += "Test Bean invoked when actually mock bean should " +
- "have been invoked";
-
+ "have been invoked";
+
if (!MockBean.mockBeanInvoked)
msg += "Mock bean not invoked";
-
+
TransactionInterceptor.clear();
//invoke shopping cart bean. ShoppingCart bean uses a Stereotype to
//assign the requires new transaction interceptor
@@ -94,28 +94,28 @@
sc.addItem("Test Item");
if (!RequiresNewTransactionInterceptor.aroundInvokeCalled)
msg += "Business method interceptor aroundInvoke in requires new " +
- "transaction interceptor not called";
+ "transaction interceptor not called";
if (RequiresNewTransactionInterceptor.aroundInvokeInvocationCount != 1)
msg += "Business method requires new interceptor invocation on " +
- "method-level interceptor annotation count not expected. "
+ "method-level interceptor annotation count not expected. "
+ "expected =1, actual="
+ RequiresNewTransactionInterceptor.aroundInvokeInvocationCount;
if (!RequiresNewTransactionInterceptor.errorMessage.trim().equals(""))
msg += RequiresNewTransactionInterceptor.errorMessage;
-
+
//TransactionInterceptor should not be called
if (TransactionInterceptor.aroundInvokeCalled)
msg += "TranscationInterceptor aroundInvoke called when a requiresnew" +
- "transaction interceptor should have been called";
-
+ "transaction interceptor should have been called";
+
//test that the mocks are called instead of the actual beans
if (ShoppingCart.shoppingCartInvoked)
msg += "Test shopping cart invoked when actually mock shopping cart " +
- "should have been invoked";
-
+ "should have been invoked";
+
if (!MockShoppingCart.mockShoppingCartInvoked)
msg += "Mock shopping cart not invoked";
-
+
//test AnotherTestBeanWithLeakQualifier was injected for LeakQualifier.
//There are no mocks for a LeakQualifier annotated bean and so
//the actual non-mock AnotherTestBeanWithLeakQualifier is injected
@@ -123,10 +123,10 @@
//and is overcome by using Specializes
if (tb_leak == null)
msg += "leak bean was not injected";
-
+
if (!(tb_leak instanceof AnotherTestBeanWithLeakQualifier))
msg += "leak bean is not an instance of AnotherTestBeanWithLeakQualifier";
-
+
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/build.xml b/appserver/tests/appserv-tests/devtests/cdi/specialization/build.xml
index f7a2b27..9a7988a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/build.xml
@@ -83,15 +83,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the specialization tests)
- ant clean (cleans all the specialization tests)
- ant build (builds all the specialization tests)
- ant setup (sets up all resources for specialization tests)
- ant deploy (deploys all the specialization apps)
- ant run (Executes all the specialization tests)
- ant undeploy (undeploys all the specialization apps)
- ant unsetup (unsets all resources for specialization tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the specialization tests)
+ ant clean (cleans all the specialization tests)
+ ant build (builds all the specialization tests)
+ ant setup (sets up all resources for specialization tests)
+ ant deploy (deploys all the specialization apps)
+ ant run (Executes all the specialization tests)
+ ant undeploy (undeploys all the specialization apps)
+ ant unsetup (unsets all resources for specialization tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/build.properties b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/build.properties
index 9a02e14..ad68be4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/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-specialization"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/build.xml b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/specialization/specialization-simple/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/descriptor/beans.xml
index 1cd96c3..1f24f15 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/descriptor/beans.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/descriptor/beans.xml
@@ -29,5 +29,5 @@
<alternatives>
<stereotype>test.beans.artifacts.MockStereotype</stereotype>
</alternatives>
-
+
</beans>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
index 1be5d11..3968912 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
@@ -30,10 +30,10 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("RequiresNewTransactionInterceptor::AroundInvoke");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/TransactionInterceptor.java
index 89b743a..f5da14c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/TransactionInterceptor.java
@@ -29,15 +29,15 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockAnotherQualifierProducer.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockAnotherQualifierProducer.java
index ea5d9dc..91b139c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockAnotherQualifierProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockAnotherQualifierProducer.java
@@ -26,7 +26,7 @@
public class MockAnotherQualifierProducer extends AnotherQualifierProducer{
@Produces @Specializes
- //We don't specify AnotherQualifier here. It is inherited from
+ //We don't specify AnotherQualifier here. It is inherited from
//AnotherQualifierProducer.getTestBeanWithAnotherQualifier
//because of the @Specializes annotation
protected TestBeanInterface getTestBeanWithAnotherQualifier() {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockShoppingCart.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockShoppingCart.java
index d90b874..c8aaf0a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockShoppingCart.java
@@ -27,17 +27,17 @@
@Specializes
@Transactional(requiresNew=true)
//This alternative (via MockStereotype) does not specify Preferred
-//qualifier, but since it specializes ShoppingCart, it
+//qualifier, but since it specializes ShoppingCart, it
//gets ShoppingCart's qualifers etc
//Interceptors are not inherited and so we need to specify Transactional
//explicitly
public class MockShoppingCart extends ShoppingCart{
public static boolean mockShoppingCartInvoked = false;
-
+
public void addItem(String s) {
mockShoppingCartInvoked = true;
System.out.println("MockShoppingCart::addItem called");
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockTestBeanForAnotherQualifier.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockTestBeanForAnotherQualifier.java
index d1ca5fd..fb4a68f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockTestBeanForAnotherQualifier.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockTestBeanForAnotherQualifier.java
@@ -30,6 +30,6 @@
public void m2() {
System.out.println("MockBean::m2 called");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/nonmock/ShoppingCart.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/nonmock/ShoppingCart.java
index 8ecf56f..ee9c308 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/nonmock/ShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/nonmock/ShoppingCart.java
@@ -28,7 +28,7 @@
public void addItem(String s) {
shoppingCartInvoked = true;
System.out.println("ShoppingCart::addItem called");
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/servlet/SimpleSpecializationTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/servlet/SimpleSpecializationTestServlet.java
index 38d836d..938d787 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/servlet/SimpleSpecializationTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/servlet/SimpleSpecializationTestServlet.java
@@ -43,15 +43,15 @@
@Inject
@Preferred
TestBeanInterface tb;
-
+
@Inject
@AnotherQualifier
TestBeanInterface tb_another;
-
+
@Inject
@Preferred
ShoppingCart sc;
-
+
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
@@ -75,61 +75,61 @@
+ TransactionInterceptor.aroundInvokeInvocationCount;
if (!TransactionInterceptor.errorMessage.trim().equals(""))
msg += TransactionInterceptor.errorMessage;
-
+
if (RequiresNewTransactionInterceptor.aroundInvokeCalled)
msg += "RequiresNew TransactionInterceptor called when " +
- "it shouldn't have been called";
-
+ "it shouldn't have been called";
+
if (TestBean.testBeanInvoked)
msg += "Test Bean invoked when actually mock bean should " +
- "have been invoked";
-
+ "have been invoked";
+
if (!MockBean.mockBeanInvoked)
msg += "Mock bean not invoked";
-
+
TransactionInterceptor.clear();
//invoke shopping cart bean. ShoppingCart bean uses a Stereotype to
//assign the requires new transaction interceptor
//This should result in an invocation on
//the RequiresNewTransactional
-
- //check that the mock shopping cart bean inherits the qualifiers when the alternative
- //bean extends the actual bean and uses @Specializes to inherit the
- //Qualifier
-
+
+ //check that the mock shopping cart bean inherits the qualifiers when the alternative
+ //bean extends the actual bean and uses @Specializes to inherit the
+ //Qualifier
+
sc.addItem("Test Item");
if (!RequiresNewTransactionInterceptor.aroundInvokeCalled)
msg += "Business method interceptor aroundInvoke in requires new " +
- "transaction interceptor not called";
+ "transaction interceptor not called";
if (RequiresNewTransactionInterceptor.aroundInvokeInvocationCount != 1)
msg += "Business method requires new interceptor invocation on " +
- "method-level interceptor annotation count not expected. "
+ "method-level interceptor annotation count not expected. "
+ "expected =1, actual="
+ RequiresNewTransactionInterceptor.aroundInvokeInvocationCount;
if (!RequiresNewTransactionInterceptor.errorMessage.trim().equals(""))
msg += RequiresNewTransactionInterceptor.errorMessage;
-
+
//TransactionInterceptor should not be called
if (TransactionInterceptor.aroundInvokeCalled)
msg += "TranscationInterceptor aroundInvoke called when a requiresnew" +
- "transaction interceptor should have been called";
-
+ "transaction interceptor should have been called";
+
//test that the mocks are called instead of the actual beans
if (ShoppingCart.shoppingCartInvoked)
msg += "Test shopping cart invoked when actually mock shopping cart " +
- "should have been invoked";
-
+ "should have been invoked";
+
if (!MockShoppingCart.mockShoppingCartInvoked)
msg += "Mock shopping cart not invoked";
-
- //check that the mock bean inherits the qualifiers when the bean is
+
+ //check that the mock bean inherits the qualifiers when the bean is
//produced through a Specializes producer method
if (tb_another == null)
msg += " bean with another qualifier was not injected";
-
+
if (!(tb_another instanceof MockTestBeanForAnotherQualifier))
msg += "bean with another qualifier is not an instance of TestBeanWithAnotherQualifier";
-
+
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/build.properties b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/build.properties
index 73652ed..bd5ae25 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/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}-alternative-stereotypes"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/build.xml b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/stereotypes/alternative-stereotypes/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/descriptor/beans.xml
index 1cd96c3..1f24f15 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/descriptor/beans.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/descriptor/beans.xml
@@ -29,5 +29,5 @@
<alternatives>
<stereotype>test.beans.artifacts.MockStereotype</stereotype>
</alternatives>
-
+
</beans>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
index 1be5d11..3968912 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
@@ -30,10 +30,10 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("RequiresNewTransactionInterceptor::AroundInvoke");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/TransactionInterceptor.java
index 89b743a..f5da14c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/TransactionInterceptor.java
@@ -29,15 +29,15 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/mock/MockShoppingCart.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/mock/MockShoppingCart.java
index fd60138..6d97dc7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/mock/MockShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/mock/MockShoppingCart.java
@@ -27,11 +27,11 @@
public class MockShoppingCart extends ShoppingCart{
public static boolean mockShoppingCartInvoked = false;
-
+
public void addItem(String s) {
mockShoppingCartInvoked = true;
System.out.println("MockShoppingCart::addItem called");
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/nonmock/ShoppingCart.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/nonmock/ShoppingCart.java
index 5408758..dff6e31 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/nonmock/ShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/nonmock/ShoppingCart.java
@@ -28,7 +28,7 @@
public void addItem(String s) {
shoppingCartInvoked = true;
System.out.println("ShoppingCart::addItem called");
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/servlet/AlternativeStereotypesTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/servlet/AlternativeStereotypesTestServlet.java
index cbee7f5..6a9d7df 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/servlet/AlternativeStereotypesTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/servlet/AlternativeStereotypesTestServlet.java
@@ -40,7 +40,7 @@
@Inject
@Preferred
TestBeanInterface tb;
-
+
@Inject
@Preferred
ShoppingCart sc;
@@ -67,19 +67,19 @@
+ TransactionInterceptor.aroundInvokeInvocationCount;
if (!TransactionInterceptor.errorMessage.trim().equals(""))
msg += TransactionInterceptor.errorMessage;
-
+
if (RequiresNewTransactionInterceptor.aroundInvokeCalled)
msg += "RequiresNew TransactionInterceptor called when " +
- "it shouldn't have been called";
-
+ "it shouldn't have been called";
+
//test that the mocks are called instead of the actual beans
if (TestBean.testBeanInvoked)
msg += "Test Bean invoked when actually mock bean should " +
- "have been invoked";
-
+ "have been invoked";
+
if (!MockBean.mockBeanInvoked)
msg += "Mock bean not invoked";
-
+
TransactionInterceptor.clear();
//invoke shopping cart bean. ShoppingCart bean uses a Stereotype to
//assign the requires new transaction interceptor
@@ -88,25 +88,25 @@
sc.addItem("Test Item");
if (!RequiresNewTransactionInterceptor.aroundInvokeCalled)
msg += "Business method interceptor aroundInvoke in requires new " +
- "transaction interceptor not called";
+ "transaction interceptor not called";
if (RequiresNewTransactionInterceptor.aroundInvokeInvocationCount != 1)
msg += "Business method requires new interceptor invocation on " +
- "method-level interceptor annotation count not expected. "
+ "method-level interceptor annotation count not expected. "
+ "expected =1, actual="
+ RequiresNewTransactionInterceptor.aroundInvokeInvocationCount;
if (!RequiresNewTransactionInterceptor.errorMessage.trim().equals(""))
msg += RequiresNewTransactionInterceptor.errorMessage;
-
+
//TransactionInterceptor should not be called
if (TransactionInterceptor.aroundInvokeCalled)
msg += "TranscationInterceptor aroundInvoke called when a requiresnew" +
- "transaction interceptor should have been called";
-
+ "transaction interceptor should have been called";
+
//test that the mocks are called instead of the actual beans
if (ShoppingCart.shoppingCartInvoked)
msg += "Test shopping cart invoked when actually mock shopping cart " +
- "should have been invoked";
-
+ "should have been invoked";
+
if (!MockShoppingCart.mockShoppingCartInvoked)
msg += "Mock shopping cart not invoked";
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/build.xml b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/build.xml
index e06f8e7..8f8daf6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/build.xml
@@ -84,15 +84,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant all (Executes all the stereotypes tests)
- ant clean (cleans all the stereotypes tests)
- ant build (builds all the stereotypes tests)
- ant setup (sets up all resources for stereotypes tests)
- ant deploy (deploys all the stereotypes apps)
- ant run (Executes all the stereotypes tests)
- ant undeploy (undeploys all the stereotypes apps)
- ant unsetup (unsets all resources for stereotypes tests)
- </echo>
+ <echo> Usage:
+ ant all (Executes all the stereotypes tests)
+ ant clean (cleans all the stereotypes tests)
+ ant build (builds all the stereotypes tests)
+ ant setup (sets up all resources for stereotypes tests)
+ ant deploy (deploys all the stereotypes apps)
+ ant run (Executes all the stereotypes tests)
+ ant undeploy (undeploys all the stereotypes apps)
+ ant unsetup (unsets all resources for stereotypes tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/build.properties b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/build.properties
index 6f7f81c..07217dc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/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}-interceptor-binding-for-stereotypes"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/build.xml b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/stereotypes/interceptor-bindings-for-stereotypes/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/descriptor/beans.xml
index 6e5b6a2..7900c53 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/descriptor/beans.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/descriptor/beans.xml
@@ -26,5 +26,5 @@
<class>test.beans.TransactionInterceptor</class>
<class>test.beans.RequiresNewTransactionInterceptor</class>
</interceptors>
-
+
</beans>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/RequiresNewTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/RequiresNewTransactionInterceptor.java
index e626a37..c030604 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/RequiresNewTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/RequiresNewTransactionInterceptor.java
@@ -28,10 +28,10 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("RequiresNewTransactionInterceptor::AroundInvoke");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/ShoppingCart.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/ShoppingCart.java
index 6175fd6..fca02aa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/ShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/ShoppingCart.java
@@ -20,10 +20,10 @@
@ActionStereotype
@Preferred
public class ShoppingCart {
-
+
public void addItem(String s) {
System.out.println("ShoppingCart::addItem called");
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/TransactionInterceptor.java
index afdc156..e1d0d52 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/TransactionInterceptor.java
@@ -27,15 +27,15 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/servlet/InterceptorBindingsForStereotypesTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/servlet/InterceptorBindingsForStereotypesTestServlet.java
index b44e631..00f6d3d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/servlet/InterceptorBindingsForStereotypesTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/servlet/InterceptorBindingsForStereotypesTestServlet.java
@@ -37,7 +37,7 @@
@Inject
@Preferred
TestBean tb;
-
+
@Inject
@Preferred
ShoppingCart sc;
@@ -64,11 +64,11 @@
+ TransactionInterceptor.aroundInvokeInvocationCount;
if (!TransactionInterceptor.errorMessage.trim().equals(""))
msg += TransactionInterceptor.errorMessage;
-
+
if (RequiresNewTransactionInterceptor.aroundInvokeCalled)
msg += "RequiresNew TransactionInterceptor called when " +
- "it shouldn't have been called";
-
+ "it shouldn't have been called";
+
TransactionInterceptor.clear();
//invoke shopping cart bean. ShoppingCart bean uses a Stereotype to
//assign the requires new transaction interceptor
@@ -77,19 +77,19 @@
sc.addItem("Test Item");
if (!RequiresNewTransactionInterceptor.aroundInvokeCalled)
msg += "Business method interceptor aroundInvoke in requires new " +
- "transaction interceptor not called";
+ "transaction interceptor not called";
if (RequiresNewTransactionInterceptor.aroundInvokeInvocationCount != 1)
msg += "Business method requires new interceptor invocation on " +
- "method-level interceptor annotation count not expected. "
+ "method-level interceptor annotation count not expected. "
+ "expected =1, actual="
+ RequiresNewTransactionInterceptor.aroundInvokeInvocationCount;
if (!RequiresNewTransactionInterceptor.errorMessage.trim().equals(""))
msg += RequiresNewTransactionInterceptor.errorMessage;
-
+
//TransactionInterceptor should not be called
if (TransactionInterceptor.aroundInvokeCalled)
msg += "TranscationInterceptor aroundInvoke called when a requiresnew" +
- "transaction interceptor should have been called";
+ "transaction interceptor should have been called";
writer.write(msg + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/build.properties b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/build.properties
index e8e6008..3d281c9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/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}-stacking-stereotypes"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/build.xml b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/build.xml
index 0b9b3a3..0a1f2f8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/build.xml
@@ -40,7 +40,7 @@
<fileset dir="client/test/client" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,23 +48,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="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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="test.client.WebTest">
<arg value="${http.host}"/>
@@ -76,10 +76,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/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/SecurityInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/SecurityInterceptor.java
index 2a6e580..1965c26 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/SecurityInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/SecurityInterceptor.java
@@ -29,10 +29,10 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("SecurityInterceptor::AroundInvoke");
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/TransactionInterceptor.java
index 0867b25..e7e0365 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/TransactionInterceptor.java
@@ -29,15 +29,15 @@
public static boolean aroundInvokeCalled = false;
public static int aroundInvokeInvocationCount = 0;
public static String errorMessage = "";
-
+
@Inject
TestDependentBean tb;
-
+
@AroundInvoke
public Object manageTransaction(InvocationContext ctx) throws Exception {
System.out.println("TransactionInterceptor::AroundInvoke");
if (tb == null) errorMessage="Dependency Injection " +
- "into TransactionInterceptor failed";
+ "into TransactionInterceptor failed";
aroundInvokeCalled = true;
aroundInvokeInvocationCount ++;
return ctx.proceed();
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/servlet/StereotypeStackingTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/servlet/StereotypeStackingTestServlet.java
index 3e66b23..b5bcf48 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/servlet/StereotypeStackingTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/servlet/StereotypeStackingTestServlet.java
@@ -64,7 +64,7 @@
tb_tx.m2();
if (TransactionInterceptor.aroundInvokeInvocationCount != 2)
msg += "Business method interceptor [TransactionInterceptor] " +
- "invocation on method-level "
+ "invocation on method-level "
+ "interceptor annotation count not expected. "
+ "expected =2, actual="
+ TransactionInterceptor.aroundInvokeInvocationCount;
@@ -76,7 +76,7 @@
+ "it shouldn't have been called";
clearInterceptors();
-
+
//Just security interceptor
if (tb_sec == null)
msg += "Injection of @secure bean failed";
@@ -87,7 +87,7 @@
tb_sec.m2();
if (SecurityInterceptor.aroundInvokeInvocationCount != 2)
msg += "Business method interceptor invocation [SecurityInterceptor]" +
- "on method-level "
+ "on method-level "
+ "interceptor annotation count not expected. "
+ "expected =2, actual="
+ SecurityInterceptor.aroundInvokeInvocationCount;
@@ -109,7 +109,7 @@
msg += "Business method interceptor [Security Interceptor] aroundInvoke not called";
if (!TransactionInterceptor.aroundInvokeCalled)
msg += "Business method interceptor [Transaction Interceptor] aroundInvoke not called";
-
+
tb_tx_sec.m2();
if (SecurityInterceptor.aroundInvokeInvocationCount != 2)
msg += "Business method interceptor invocation [SecurityInterceptor]" +
@@ -123,7 +123,7 @@
+ "interceptor annotation count not expected. "
+ "expected =2, actual="
+ TransactionInterceptor.aroundInvokeInvocationCount;
-
+
if (!SecurityInterceptor.errorMessage.trim().equals(""))
msg += SecurityInterceptor.errorMessage;
if (!TransactionInterceptor.errorMessage.trim().equals(""))
diff --git a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/build.properties b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/build.properties
index 3719e49..45bb1b3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/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}-transaction-scoped"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/client/test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/client/test/client/WebTest.java
index 52e1c74..3f2ce03 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/client/test/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/client/test/client/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Functional test for @TransactionScoped");
WebTest webTest = new WebTest(args);
@@ -48,7 +48,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -58,7 +58,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot + "/TransactionScopedTestServlet";
System.out.println("opening connection to " + url);
HttpURLConnection conn = (HttpURLConnection) (new URL(url)).openConnection();
@@ -98,6 +98,6 @@
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/unproxyable-deps/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/WebTest.java
index 3b8c277..2308a6f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Testing Alternatives");
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);
@@ -70,6 +70,6 @@
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/build.properties b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/build.properties
index 317b372..96f42ed 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/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-alternatives"/>
<property name="appname" value="${module}-servlet-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/build.xml b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/build.xml
index 9a442d6..972ae00 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/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"/>
+ <antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -75,12 +75,12 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
-<!-- Nothing to undeply here as the deployment must fail for this test
+<!-- Nothing to undeply here as the deployment must fail for this test
<antcall target="undeploy-war-common"/>
-->
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/WebTest.java
index 9201dcb..5860a8a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Testing Unsatisfied dependencies");
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);
@@ -96,10 +96,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/unsatisfied-deps/build.properties b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/build.properties
index b44a74e..f2eb345 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/build.properties
+++ b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/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-unsatisfieddeps"/>
<property name="appname" value="${module}-servlet-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/build.xml b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/build.xml
index c0d904d..872f366 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/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/unsatisfied-deps/servlet/test/artifacts/MockPaymentProcessor.java b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/artifacts/MockPaymentProcessor.java
index 75cc52b..47b5bb5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/artifacts/MockPaymentProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/artifacts/MockPaymentProcessor.java
@@ -18,7 +18,7 @@
import jakarta.enterprise.inject.Alternative;
-@Alternative
+@Alternative
public class MockPaymentProcessor implements PaymentProcessor{
@Override
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/beans/BeanToTestUnsatisfiedDependencies.java b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/beans/BeanToTestUnsatisfiedDependencies.java
index 1373c6b..89277c3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/beans/BeanToTestUnsatisfiedDependencies.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/beans/BeanToTestUnsatisfiedDependencies.java
@@ -44,6 +44,6 @@
+ numberOfPaymentProcessors);
System.out.println("mock payment procssor:" + pp);
return (numberOfPaymentProcessors == 1) // MockPaymentProcessor
- && (pp instanceof MockPaymentProcessor);
+ && (pp instanceof MockPaymentProcessor);
}
}
